From 49e2d748f48773f250857a5f0d168859d1267ae5 Mon Sep 17 00:00:00 2001
From: Dheeraj Gautam <dgautam@juniper.net>
Date: Tue, 1 Nov 2016 13:59:13 -0700
Subject: [PATCH] SM-Openstack: don't install nova-compute on openstack nodes

Closes-Bug: #1638321

nova::compute and nova::compute::neutron are not needed for openstack roles.
only needed for compute.

Change-Id: If36e794c246dccb3ea44446d3815517809c60627
---
 .../manifests/profile/openstack/nova.pp       | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack/nova.pp b/contrail/environment/modules/contrail/manifests/profile/openstack/nova.pp
index b7aade00..38e8bed6 100644
--- a/contrail/environment/modules/contrail/manifests/profile/openstack/nova.pp
+++ b/contrail/environment/modules/contrail/manifests/profile/openstack/nova.pp
@@ -15,6 +15,7 @@
   $sriov_enable      = $::contrail::params::sriov_enable,
   $enable_ceilometer = $::contrail::params::enable_ceilometer,
   $package_sku       = $::contrail::params::package_sku,
+  $host_roles        = $::contrail::params::host_roles,
   $contrail_internal_vip      = $::contrail::params::contrail_internal_vip,
   $openstack_rabbit_servers   = $::contrail::params::openstack_rabbit_hosts,
   $neutron_shared_secret      = $::contrail::params::os_neutron_shared_secret,
@@ -147,20 +148,22 @@
     enabled => 'true',
   }
 
-  # TODO: it's important to set up the vnc properly
-  class { '::nova::compute':
-    enabled                       => $contrail_is_compute,
-    vnc_enabled                   => true,
-    vncserver_proxyclient_address => $management_address,
-    vncproxy_host                 => $address_api,
-    instance_usage_audit          => $instance_usage_audit,
-    instance_usage_audit_period   => $instance_usage_audit_period
-  }
+  if ('compute' in $host_roles) {
+    # TODO: it's important to set up the vnc properly
+    class { '::nova::compute':
+      enabled                       => $contrail_is_compute,
+      vnc_enabled                   => true,
+      vncserver_proxyclient_address => $management_address,
+      vncproxy_host                 => $address_api,
+      instance_usage_audit          => $instance_usage_audit,
+      instance_usage_audit_period   => $instance_usage_audit_period
+    }
 
-  #TODO make sure we have vif package
+    #TODO make sure we have vif package
 
-  class { '::nova::compute::neutron':
-    libvirt_vif_driver => "nova_contrail_vif.contrailvif.VRouterVIFDriver"
+    class { '::nova::compute::neutron':
+      libvirt_vif_driver => "nova_contrail_vif.contrailvif.VRouterVIFDriver"
+    }
   }
 
   class { '::nova::network::neutron':