Merge "Adds Environment File for Removing Sahara during M/N upgrade"

environments/major-upgrade-pacemaker-converge.yaml

@@ -1,2 +1,6 @@
 parameter_defaults:
   UpgradeLevelNovaCompute: ''
+
+resource_registry:
+  OS::TripleO::Services::SaharaApi: ../puppet/services/sahara-api.yaml
+  OS::TripleO::Services::SaharaEngine: ../puppet/services/sahara-engine.yaml

environments/major-upgrade-remove-sahara.yaml

@@ -0,0 +1,6 @@
+parameter_defaults:
+  KeepSaharaServicesOnUpgrade: false
+resource_registry:
+  OS::TripleO::Services::SaharaApi: OS::Heat::None
+  OS::TripleO::Services::SaharaEngine: OS::Heat::None
+

extraconfig/tasks/major_upgrade_controller_pacemaker_2.sh

@@ -65,6 +65,5 @@ if [[ -n $(is_bootstrap_node) ]]; then
     nova-manage api_db sync
     nova-manage db online_data_migrations
     gnocchi-upgrade
-    #TODO(marios):someone from sahara needs to check this:
-    # sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
+    sahara-db-manage --config-file /etc/sahara/sahara.conf upgrade head
 fi

extraconfig/tasks/major_upgrade_controller_pacemaker_3.sh

@@ -16,7 +16,11 @@ systemctl_swift start
 # We need to start the systemd services we explicitely stopped at step _1.sh
 # FIXME: Should we let puppet during the convergence step do the service enabling or
 # should we add it here?
-for service in $(services_to_migrate); do
+services=$(services_to_migrate)
+if [[ ${keep_sahara_services_on_upgrade} =~ [Ff]alse ]] ; then
+    services=${services%%openstack-sahara*}
+fi
+for service in $(services); do
     manage_systemd_service start "${service%%-clone}"
     check_resource_systemd "${service%%-clone}" started 600
 done

extraconfig/tasks/major_upgrade_pacemaker.yaml

@@ -22,6 +22,11 @@ parameters:
     type: boolean
     default: false
     description: If enabled, Ceph upgrade will be forced even though cluster or PGs status is not clean
+  KeepSaharaServicesOnUpgrade:
+    type: boolean
+    default: true
+    description: Whether to keep Sahara services when upgrading controller nodes from mitaka to newton
+
 
 resources:
   # TODO(jistr): for Mitaka->Newton upgrades and further we can use
@@ -127,7 +132,13 @@ resources:
       config:
         list_join:
         - ''
-        - - get_file: pacemaker_common_functions.sh
+        - - str_replace:
+              template: |
+                #!/bin/bash
+                keep_sahara_services_on_upgrade='KEEP_SAHARA_SERVICES_ON_UPGRADE'
+              params:
+                KEEP_SAHARA_SERVICES_ON_UPGRADE: {get_param: KeepSaharaServicesOnUpgrade}
+          - get_file: pacemaker_common_functions.sh
           - get_file: major_upgrade_pacemaker_migrations.sh
           - get_file: major_upgrade_controller_pacemaker_3.sh