SM-Ceilometer: change cinder-scheduler is false

Closes-Bug: #1666180 1. moved all quotes to double quotes 2. changes cinder-scheduler to conditional Change-Id: I4aad4a384da9d3cbee9414816334aa29a8139fac
Juniper · Feb 20, 2017 · a94ff6c · a94ff6c
1 parent 416e8c3
commit a94ff6c
Showing 1 changed file with 16 additions and 10 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp b/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp
@@ -47,25 +47,24 @@
   if ($enable_module and 'openstack' in $host_roles and $is_there_roles_to_delete == false) {
     if ($enable_ceilometer) {
       if ('compute' in $host_roles) {
-        $ceilometer_compute = 'ceilometer-agent-compute'
+        $ceilometer_compute = "ceilometer-agent-compute"
       } else {
-        $ceilometer_compute = ""
+        $ceilometer_compute = []
       }
-      $ceilometer_packages = ['ceilometer-common',
-                              'ceilometer-backend-package',
-                              'ceilometer-collector',
-                              'ceilometer-agent-notification',
-                              'ceilometer-agent-central',
-                              'ceilometer-api',
+      $ceilometer_packages = ["ceilometer-common",
+                              "ceilometer-backend-package",
+                              "ceilometer-collector",
+                              "ceilometer-agent-notification",
+                              "ceilometer-agent-central",
+                              "ceilometer-api",
                               $ceilometer_compute ]
     } else {
       $ceilometer_packages = []
     }
-    $pkg_list_a = ["${keystone::params::package_name}",
+    $pkg_list_b = ["${keystone::params::package_name}",
                           "${glance::params::api_package_name}",
                           "${glance::params::registry_package_name}",
                           "${cinder::params::package_name}",
-                          "${cinder::params::scheduler_package}",
                           "${heat::params::api_package_name}",
                           "${heat::params::engine_package_name}",
                           "${heat::params::common_package_name}",
@@ -77,6 +76,13 @@
                           "python-keystone",
                           "python-cinderclient",
                           $ceilometer_packages]
+
+    # scheduler_package is false in case of Centos
+    if $::cinder::params::scheduler_package {
+        $pkg_list_a = [$pkg_list_b, "${cinder::params::scheduler_package}"]
+    } else {
+        $pkg_list_a = $pkg_list_b
+    }
     # api_package is false in case of Centos
     if $::cinder::params::api_package {
         $pkg_list = [$pkg_list_a, "${cinder::params::api_package}"]