Merge "SM_KILO: Fix code that was overwritten."

Juniper · Jan 18, 2016 · 6c91609 · 6c91609
2 parents 1c5da82 + bf6bb20
commit 6c91609
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp b/contrail/environment/modules/contrail/manifests/profile/openstack_controller.pp
@@ -40,7 +40,13 @@
         openstack::resources::database { 'neutron': }
         ->
         package { 'neutron-server': ensure => present }
-        ->
+
+        if ($package_sku != 'kilo') {
+            package { 'contrail-openstack-dashboard':
+                ensure  => latest,
+            }
+            Package['contrail-openstack-dashboard'] -> Exec['neutron-db-sync']
+        }
         notify { "contrail::profile::openstack_controller - neutron_db_connection = ${::openstack::resources::connectors::neutron}":; }
         ->
         class {'::contrail::profile::neutron_db_sync':