Merge "Install bridge-utils only if needed"

manifests/compute.pp

@@ -10,7 +10,8 @@ class nova::compute (
   $vncproxy_port                 = '6080',
   $vncproxy_path                 = '/vnc_auto.html',
   $force_config_drive            = false,
-  $virtio_nic                    = false
+  $virtio_nic                    = false,
+  $neutron_enabled               = true
 ) {
 
   include nova::params
@@ -30,9 +31,12 @@ class nova::compute (
     'DEFAULT/vncserver_proxyclient_address': value => $vncserver_proxyclient_address;
   }
 
-  package { 'bridge-utils':
-    ensure => present,
-    before => Nova::Generic_service['compute'],
+  if $neutron_enabled != true {
+    # Install bridge-utils if we use nova-network
+    package { 'bridge-utils':
+      ensure => present,
+      before => Nova::Generic_service['compute'],
+    }
   }
 
   nova::generic_service { 'compute':

spec/classes/nova_compute_spec.rb

@@ -10,7 +10,8 @@ describe 'nova::compute' do
 
     let :params do
       {
-        :vncproxy_host => '127.0.0.1'
+        :vncproxy_host   => '127.0.0.1',
+        :neutron_enabled => true
       }
     end
 
@@ -36,7 +37,7 @@ describe 'nova::compute' do
         'ensure' => 'present',
         'notify' => 'Service[nova-compute]'
       ) }
-      it { should contain_package('bridge-utils').with(
+      it { should_not contain_package('bridge-utils').with(
         :ensure => 'present',
         :before => 'Nova::Generic_service[compute]'
       ) }