Closes-Bug: #1594986 - Move Upgrade time scripts/resources to upgrade…

… path

Some tasks like temporary deletion of packages should run only during contrail-upgrade

Change-Id: I4f2fc1ed4c5fd0e1f476f6405f5edb5c38781de7

contrail/environment/modules/contrail/manifests/collector/install.pp

@@ -1,9 +1,14 @@
-class contrail::collector::install {
-    exec { 'Temporarily delete contrail-analytics to upgrade python-kafka' :
-          command   => "dpkg -P contrail-analytics contrail-openstack-analytics python-kafka-python",
-          provider  => shell,
-          logoutput => $contrail_logoutput,
-    } ->
+class contrail::collector::install(
+    $upgrade_needed = $::contrail::params::upgrade_needed,
+) {
+    if ($upgrade_needed == 1) {
+        exec { 'Temporarily delete contrail-analytics to upgrade python-kafka' :
+            command   => "dpkg -P contrail-analytics contrail-openstack-analytics python-kafka-python",
+            provider  => shell,
+            logoutput => $contrail_logoutput,
+        }
+        Exec['Temporarily delete contrail-analytics to upgrade python-kafka'] -> Package['python-kafka']
+    }
     package {'python-kafka':
         ensure => latest,
         notify => Service['supervisor-analytics']

contrail/environment/modules/contrail/manifests/config/install.pp

@@ -2,6 +2,7 @@
  $contrail_host_roles = $::contrail::params::host_roles,
  $contrail_internal_vip = $::contrail::params::contrail_internal_vip,
  $internal_vip = $::contrail::params::internal_vip,
+ $upgrade_needed = $::contrail::params::upgrade_needed,
 ) {
   # Install a specific version of keepalived in non-ha
   # case also, to support upgrade of contrail software.
@@ -26,11 +27,14 @@
       Package['keepalived'] -> Package['contrail-openstack-config']
   }
 
-  exec { 'Temporarily delete contrail-openstack-config, contrail-config-openstack' :
+  if ($upgrade_needed == 1) {
+      exec { 'Temporarily delete contrail-openstack-config, contrail-config-openstack' :
           command   => "apt-get -y --force-yes purge contrail-openstack-config contrail-config-openstack",
           provider  => shell,
           logoutput => $contrail_logoutput,
-  } ->
+      }
+      Exec['Temporarily delete contrail-openstack-config, contrail-config-openstack'] -> Package['contrail-config']
+  }
   package { 'contrail-config':
     ensure => latest,
     configfiles => "replace",