From d3b9c94be6facfc17b55b0e611a7cab44c2fff3a Mon Sep 17 00:00:00 2001
From: Kamlesh Parmar <kparmar@juniper.net>
Date: Tue, 1 Nov 2016 17:52:33 -0700
Subject: [PATCH] Closes Bug: #1635365 do not reboot compute on upgrade.

Change-Id: I8250a2a25fbd0f3bde053c603047355e35c48b49
---
 .../modules/contrail/manifests/compute/config.pp    | 13 ++++++++-----
 .../modules/contrail/manifests/compute/service.pp   |  8 ++++++++
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/contrail/environment/modules/contrail/manifests/compute/config.pp b/contrail/environment/modules/contrail/manifests/compute/config.pp
index 787e8cfd..e913bdba 100644
--- a/contrail/environment/modules/contrail/manifests/compute/config.pp
+++ b/contrail/environment/modules/contrail/manifests/compute/config.pp
@@ -52,6 +52,7 @@
   $kombu_ssl_ca_certs = $::contrail::params::kombu_ssl_ca_certs,
   $kombu_ssl_certfile = $::contrail::params::kombu_ssl_certfile,
   $kombu_ssl_keyfile  = $::contrail::params::kombu_ssl_keyfile,
+  $upgrade_needed = $::contrail::params::upgrade_needed,
 ){
   $config_ip_to_use = $::contrail::params::config_ip_to_use
   $keystone_ip_to_use = $::contrail::params::keystone_ip_to_use
@@ -348,11 +349,13 @@
   }
   ->
   class {'::contrail::compute::setup_compute_server_setup':}
-  ->
-  reboot { 'compute':
-    apply => "immediately",
-    subscribe       => Exec ["setup-compute-server-setup"],
-    timeout => 0,
+  if ($upgrade_needed != 1) {
+      Class ['::contrail::compute::setup_compute_server_setup'] ->
+      reboot { 'compute':
+        apply => "immediately",
+        subscribe       => Exec ["setup-compute-server-setup"],
+        timeout => 0,
+      }
   }
 
   Class['::contrail::compute::setup_compute_server_setup'] -> Nova_config <||>
diff --git a/contrail/environment/modules/contrail/manifests/compute/service.pp b/contrail/environment/modules/contrail/manifests/compute/service.pp
index 30afbbec..3a9e99de 100644
--- a/contrail/environment/modules/contrail/manifests/compute/service.pp
+++ b/contrail/environment/modules/contrail/manifests/compute/service.pp
@@ -4,6 +4,7 @@
   $compute_ip_list = $::contrail::params::compute_ip_list,
   $nfs_server = $::contrail::params::nfs_server,
   $contrail_logoutput = $::contrail::params::contrail_logoutput,
+  $upgrade_needed = $::contrail::params::upgrade_needed,
 ) {
     if !('toragent' in $contrail::params::host_roles) {
         service { 'supervisor-vrouter':
@@ -35,4 +36,11 @@
          enable => true
        }
     }
+    if ($upgrade_needed == 1) {
+        exec { 'upgrade-vrouter-restart' :
+            command => "rmmod vrouter && service supervisor-vrouter restart",
+            provider => shell,
+            logoutput => $contrail_logoutput,
+        }
+    }
 }