Merge "Make api_extensions_path a parameter for "neutron""

xbezdick · Sep 30, 2014 · dcd122e · dcd122e
2 parents 2decc59 + 39b48a2
commit dcd122e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -85,6 +85,11 @@
 #   (optional) Enables network namespaces
 #   Defaults to false
 #
+# [*api_extensions_path*]
+#   (optional) Specify additional paths for API extensions that the
+#   module in use needs to load.
+#   Defaults to undef
+#
 # [*report_interval*]
 #   (optional) Seconds between nodes reporting state to server; should be less than
 #   agent_down_time, best if it is half or less than agent_down_time.
@@ -209,6 +214,7 @@
   $allow_pagination            = false,
   $allow_sorting               = false,
   $allow_overlapping_ips       = false,
+  $api_extensions_path         = undef,
   $root_helper                 = 'sudo neutron-rootwrap /etc/neutron/rootwrap.conf',
   $report_interval             = '30',
   $control_exchange            = 'neutron',
@@ -315,6 +321,7 @@
     'DEFAULT/allow_overlapping_ips':   value => $allow_overlapping_ips;
     'DEFAULT/control_exchange':        value => $control_exchange;
     'DEFAULT/rpc_backend':             value => $rpc_backend;
+    'DEFAULT/api_extensions_path':     value => $api_extensions_path;
     'agent/root_helper':               value => $root_helper;
     'agent/report_interval':           value => $report_interval;
   }

diff --git a/spec/classes/neutron_init_spec.rb b/spec/classes/neutron_init_spec.rb
@@ -121,6 +121,7 @@
       should contain_neutron_config('DEFAULT/allow_pagination').with_value(false)
       should contain_neutron_config('DEFAULT/allow_sorting').with_value(false)
       should contain_neutron_config('DEFAULT/allow_overlapping_ips').with_value(false)
+      should contain_neutron_config('DEFAULT/api_extensions_path').with_value(nil)
       should contain_neutron_config('DEFAULT/control_exchange').with_value('neutron')
       should contain_neutron_config('agent/root_helper').with_value('sudo neutron-rootwrap /etc/neutron/rootwrap.conf')
       should contain_neutron_config('agent/report_interval').with_value('30')