Merge "Partial-Bug: #1557755 Server Manager: Fix re-ordering and othe…

…r code changes which were introduced by re-factoring of puppet" into R3.0
Juniper · Mar 23, 2016 · 465d3c8 · 465d3c8
2 parents e4b3ae3 + 1ce1ad4
commit 465d3c8
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 9 deletions.
diff --git a/contrail/environment/modules/contrail/manifests/collector/install.pp b/contrail/environment/modules/contrail/manifests/collector/install.pp
@@ -7,10 +7,12 @@
     }
     package {'python-kafka':
         ensure => latest,
-        before => Package['contrail-analytics']
+        before => Package['contrail-analytics'],
+        notify => Service['supervisor-analytics']
     }
     package { ['contrail-analytics','contrail-openstack-analytics', 'contrail-docs'] :
         ensure => latest,
         configfiles => "replace",
+        notify => Service['supervisor-analytics']
     }
 }
diff --git a/contrail/environment/modules/contrail/manifests/compute/install.pp b/contrail/environment/modules/contrail/manifests/compute/install.pp
@@ -27,7 +27,8 @@
 
     if ( $opencontrail_only == true) {
         package{ 'contrail-openstack-vrouter' :
-            ensure => present
+            ensure => latest,
+            notify => Service['supervisor-vrouter']
         }
     } else {
         #Determine vrouter package to be installed based on the kernel
@@ -69,7 +70,7 @@
         }
         # Main code for class starts here
         # Ensure all needed packages are latest
-        package { [ $vrouter_pkg, 'contrail-openstack-vrouter'] : ensure => latest}
+        package { [ $vrouter_pkg, 'contrail-openstack-vrouter'] : ensure => latest, notify => Service['supervisor-vrouter']}
 
         if ($enable_lbass == true) {
             package{ ['haproxy', 'iproute'] : ensure => present,}

diff --git a/contrail/environment/modules/contrail/manifests/compute/service.pp b/contrail/environment/modules/contrail/manifests/compute/service.pp
@@ -5,6 +5,10 @@
   $nfs_server = $::contrail::params::nfs_server,
   $contrail_logoutput = $::contrail::params::contrail_logoutput,
 ) {
+    service { 'supervisor-vrouter':
+        ensure  => running,
+        enable  => true,
+    }
     service { 'nova-compute' :
         enable => $nova_compute_status,
         ensure => $nova_compute_status,

diff --git a/contrail/environment/modules/contrail/manifests/config/install.pp b/contrail/environment/modules/contrail/manifests/config/install.pp
@@ -35,16 +35,19 @@
   package { 'contrail-config':
     ensure => latest,
     configfiles => "replace",
-    before => Package['contrail-openstack-config']
+    before => Package['contrail-openstack-config'],
+    notify => Service['supervisor-config']
   }
   package { 'contrail-openstack-config' :
     ensure => latest,
     configfiles => "replace",
-    before => Package['contrail-config-openstack']
+    before => Package['contrail-config-openstack'],
+    notify => Service['supervisor-config']
   }
   package { 'contrail-config-openstack' :
     ensure => latest,
     configfiles => "replace",
+    notify => Service['supervisor-config']
   }
 
 }
diff --git a/contrail/environment/modules/contrail/manifests/control/install.pp b/contrail/environment/modules/contrail/manifests/control/install.pp
@@ -1,5 +1,6 @@
 class contrail::control::install() {
     package { 'contrail-openstack-control' :
-        ensure => latest
+        ensure => latest,
+        notify => Service['supervisor-control']
     }
 }
diff --git a/contrail/environment/modules/contrail/manifests/database/install.pp b/contrail/environment/modules/contrail/manifests/database/install.pp
@@ -28,6 +28,7 @@
   ->
   notify { "executed contrail contrail_zk_exec_cmd : ${cassandra_upgrade_cmd}":; }
   package { 'contrail-openstack-database' :
-    ensure => latest
+    ensure => latest,
+    notify => Service["supervisor-database"]
   }
 }
diff --git a/contrail/environment/modules/contrail/manifests/webui/install.pp b/contrail/environment/modules/contrail/manifests/webui/install.pp
@@ -8,7 +8,7 @@
         $ensure_storage_package = 'absent'
     }
 
-    package { 'contrail-openstack-webui' : ensure => latest, }
+    package { 'contrail-openstack-webui' : ensure => latest, notify => Service['supervisor-webui']  }
     ->
-    package { 'contrail-web-storage' : ensure => $ensure_storage_package }
+    package { 'contrail-web-storage' : ensure => $ensure_storage_package, notify => Service['supervisor-webui'] }
 }