Merge pull request #178 from derekhiggins/fix_rootwrap_config

Fixing incorrect name for rootwrap_config config option
derekhiggins · Nov 1, 2012 · 2b40a3e · 2b40a3e
2 parents 041142d + a9f435d
commit 2b40a3e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -50,7 +50,7 @@
   $verbose = false,
   $periodic_interval = '60',
   $report_interval = '10',
-  $root_wrap_config = '/etc/nova/rootwrap.conf',
+  $rootwrap_config = '/etc/nova/rootwrap.conf',
   # deprecated in folsom
   #$root_helper = $::nova::params::root_helper,
   $monitoring_notifications = false
@@ -174,7 +174,7 @@
     'state_path':        value => $state_path;
     'lock_path':         value => $lock_path;
     'service_down_time': value => $service_down_time;
-    'root_wrap_config':  value => $root_wrap_config;
+    'rootwrap_config':  value => $rootwrap_config;
   }
 
 

diff --git a/spec/classes/nova_init_spec.rb b/spec/classes/nova_init_spec.rb
@@ -73,7 +73,7 @@
     it { should contain_nova_config('state_path').with_value('/var/lib/nova') }
     it { should contain_nova_config('lock_path').with_value('/var/lock/nova') }
     it { should contain_nova_config('service_down_time').with_value('60') }
-    it { should contain_nova_config('root_wrap_config').with_value('/etc/nova/rootwrap.conf') }
+    it { should contain_nova_config('rootwrap_config').with_value('/etc/nova/rootwrap.conf') }
 
 
 
@@ -126,7 +126,7 @@
         'name'   => 'openstack-nova',
         'ensure' => 'present'
       )}
-      it { should contain_nova_config('root_wrap_config').with_value('/etc/nova/rootwrap.conf') }
+      it { should contain_nova_config('rootwrap_config').with_value('/etc/nova/rootwrap.conf') }
     end
   end
 end