Merge "Stop services for unupgraded controllers" into stable/stein

deployment/aodh/aodh-api-container-puppet.yaml

@@ -240,6 +240,21 @@ outputs:
           vars:
             containers_to_rm:
               - aodh_api
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop aodh api container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - aodh_api
+                tripleo_delegate_to: "{{ groups['aodh_api'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/aodh/aodh-evaluator-container-puppet.yaml

@@ -130,6 +130,21 @@ outputs:
           vars:
             containers_to_rm:
               - aodh_evaluator
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop aodh evaluator container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - aodh_evaluator
+                tripleo_delegate_to: "{{ groups['aodh_evaluator'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/aodh/aodh-listener-container-puppet.yaml

@@ -130,6 +130,21 @@ outputs:
           vars:
             containers_to_rm:
               - aodh_listener
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop aodh listener container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - aodh_listener
+                tripleo_delegate_to: "{{ groups['aodh_listener'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/aodh/aodh-notifier-container-puppet.yaml

@@ -130,6 +130,21 @@ outputs:
           vars:
             containers_to_rm:
               - aodh_notifier
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop aodh notifier container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - aodh_notifier
+                tripleo_delegate_to: "{{ groups['aodh_notifier'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/ceilometer/ceilometer-agent-central-container-puppet.yaml

@@ -168,6 +168,21 @@ outputs:
           vars:
             containers_to_rm:
               - ceilometer_agent_central
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop ceilometer agent central container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - ceilometer_agent_central
+                tripleo_delegate_to: "{{ groups['ceilometer_agent_central'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/ceilometer/ceilometer-agent-notification-container-puppet.yaml

@@ -178,6 +178,21 @@ outputs:
           vars:
             containers_to_rm:
               - ceilometer_agent_notification
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop ceilometer agent notification container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - ceilometer_agent_notification
+                tripleo_delegate_to: "{{ groups['ceilometer_agent_notification'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/cinder/cinder-api-container-puppet.yaml

@@ -370,6 +370,14 @@ outputs:
                 fi
               tags: pre-upgrade
               when: is_cinder_api_bootstrap_node|bool
+      post_upgrade_tasks:
+        - when: step|int == 1
+          import_role:
+            name: tripleo-docker-rm
+          vars:
+            containers_to_rm:
+              - cinder_api
+              - cinder_api_cron
       external_upgrade_tasks:
         - when: step|int == 1
           block:
@@ -380,14 +388,21 @@ outputs:
               tags:
                 - online_upgrade
                 - online_upgrade_cinder
-      post_upgrade_tasks:
+        - when:
-        - when: step|int == 1
+            - step|int == 1
-          import_role:
+          tags:
-            name: tripleo-docker-rm
+            - never
-          vars:
+            - system_upgrade_transfer_data
-            containers_to_rm:
+            - system_upgrade_stop_services
-              - cinder_api
+          block:
-              - cinder_api_cron
+            - name: Stop cinder api container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - cinder_api
+                  - cinder_api_cron
+                tripleo_delegate_to: "{{ groups['cinder_api'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/cinder/cinder-scheduler-container-puppet.yaml

@@ -158,6 +158,21 @@ outputs:
           vars:
             containers_to_rm:
               - cinder_scheduler
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop cinder scheduler container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - cinder_scheduler
+                tripleo_delegate_to: "{{ groups['cinder_scheduler'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/database/mysql-pacemaker-puppet.yaml

@@ -586,16 +586,12 @@ outputs:
         - vars:
             mysql_upgrade_transfer: {get_param: MysqlUpgradeTransfer}
           when:
-            - step|int == 1
+            - step|int == 2
             - mysql_upgrade_transfer
           tags:
             - never
             - system_upgrade_transfer_data
           block:
-            - name: Disable mysql
-              become: true
-              command: /usr/sbin/pcs resource disable galera-bundle --wait
-              delegate_to: "{{hostvars[groups['overcloud'][0]]['mysql_short_node_names'][1]}}"
             - name: Transfer mysql data
               include_role:
                 name: tripleo-transfer

deployment/database/redis-container-puppet.yaml

@@ -246,6 +246,27 @@ outputs:
           package:
             name: redis
             state: absent
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop redis container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  with_items:
+                    list_concat:
+                      - - redis
+                      - - if:
+                            - internal_tls_enabled
+                            - - redis_tls_proxy
+                            - null
+                tripleo_delegate_to: "{{ groups['redis'] | default([]) }}"
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/deprecated/nova/nova-placement-container-puppet.yaml

@@ -240,3 +240,18 @@ outputs:
           vars:
             containers_to_rm:
               - nova_placement
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop nova_placement container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - nova_placement
+                tripleo_delegate_to: "{{ groups['nova_placement'] | default([]) }}"

deployment/deprecated/panko/panko-api-container-puppet.yaml

@@ -338,3 +338,19 @@ outputs:
             containers_to_rm:
               - panko_api
               - panko_api_cron
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop panko containers
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - panko_api
+                  - panko_api_cron
+                tripleo_delegate_to: "{{ groups['panko_api'] | default([]) }}"

deployment/glance/glance-api-container-puppet.yaml

@@ -627,6 +627,21 @@ outputs:
                         - internal_tls_enabled
                         - - glance_api_tls_proxy
                         - null
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop glance api container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - glance_api
+                tripleo_delegate_to: "{{ groups['glance_api'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/gnocchi/gnocchi-api-container-puppet.yaml

@@ -381,6 +381,21 @@ outputs:
           vars:
             containers_to_rm:
               - gnocchi_api
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop gnocchi container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - gnocchi_api
+                tripleo_delegate_to: "{{ groups['gnocchi_api'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/gnocchi/gnocchi-metricd-container-puppet.yaml

@@ -185,6 +185,21 @@ outputs:
           vars:
             containers_to_rm:
               - gnocchi_metricd
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop gnocchi metricd container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - gnocchi_metricd
+                tripleo_delegate_to: "{{ groups['gnocchi_metricd'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/gnocchi/gnocchi-statsd-container-puppet.yaml

@@ -179,6 +179,21 @@ outputs:
           vars:
             containers_to_rm:
               - gnocchi_statsd
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop gnocchi statsd container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - gnocchi_statsd
+                tripleo_delegate_to: "{{ groups['gnocchi_statsd'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - name: FFU check if openstack-gnocchi-statsd is deployed
           command: systemctl is-enabled --quiet openstack-gnocchi-statsd

deployment/haproxy/haproxy-container-puppet.yaml

@@ -322,6 +322,21 @@ outputs:
           vars:
             containers_to_rm:
               - haproxy
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop haproxy container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - haproxy
+                tripleo_delegate_to: "{{ groups['haproxy'] | default([]) }}"
       host_prep_tasks:
         - {get_attr: [HAProxyPublicTLS, role_data, host_prep_tasks]}
         - name: Check if rsyslog exists

deployment/heat/heat-api-cfn-container-puppet.yaml

@@ -223,6 +223,21 @@ outputs:
           vars:
             containers_to_rm:
               - heat_api_cfn
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop heat cfn container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - heat_api_cfn
+                tripleo_delegate_to: "{{ groups['heat_api_cfn'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/heat/heat-api-container-puppet.yaml

@@ -272,6 +272,22 @@ outputs:
             containers_to_rm:
               - heat_api
               - heat_api_cron
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop heat api container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - heat_api
+                  - heat_api_cron
+                tripleo_delegate_to: "{{ groups['heat_api'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/heat/heat-engine-container-puppet.yaml

@@ -280,6 +280,21 @@ outputs:
           vars:
             containers_to_rm:
               - heat_engine
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop heat engine container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - heat_engine
+                tripleo_delegate_to: "{{ groups['heat_engine'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/horizon/horizon-container-puppet.yaml

@@ -332,3 +332,18 @@ outputs:
           vars:
             containers_to_rm:
               - horizon
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop horizon container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - horizon
+                tripleo_delegate_to: "{{ groups['horizon'] | default([]) }}"

deployment/keystone/keystone-container-puppet.yaml

@@ -814,6 +814,22 @@ outputs:
             containers_to_rm:
               - keystone
               - keystone_cron
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop keystone container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - keystone
+                  - keystone_cron
+                tripleo_delegate_to: "{{ groups['keystone'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/logrotate/logrotate-crond-container-puppet.yaml

@@ -135,3 +135,18 @@ outputs:
           vars:
             containers_to_rm:
               - logrotate_crond
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop logrotate container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - logrotate_crond
+                tripleo_delegate_to: "{{ groups['logrotate_crond'] | default([]) }}"

deployment/memcached/memcached-container-puppet.yaml

@@ -186,6 +186,21 @@ outputs:
           vars:
             containers_to_rm:
               - memcached
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop memcached container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - memcached
+                tripleo_delegate_to: "{{ groups['memcached'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/neutron/neutron-api-container-puppet.yaml

@@ -422,6 +422,21 @@ outputs:
                         - internal_tls_enabled
                         - - neutron_server_tls_proxy
                         - null
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop neutron api container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - neutron_api
+                tripleo_delegate_to: "{{ groups['neutron_api'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/nova/nova-api-container-puppet.yaml

@@ -494,6 +494,21 @@ outputs:
               tags:
                 - online_upgrade
                 - online_upgrade_nova
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop nova api container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - nova_api
+                  - nova_api_cron
+                tripleo_delegate_to: "{{ groups['nova_api'] | default([]) }}"
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/nova/nova-conductor-container-puppet.yaml

@@ -206,6 +206,21 @@ outputs:
           vars:
             containers_to_rm:
               - nova_conductor
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop nova conductor container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - nova_conductor
+                tripleo_delegate_to: "{{ groups['nova_conductor'] | default([]) }}"
       fast_forward_upgrade_tasks:
         - when:
             - step|int == 0

deployment/nova/nova-metadata-container-puppet.yaml

@@ -253,6 +253,21 @@ outputs:
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: {get_attr: [NovaMetadataLogging, host_prep_tasks]}
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop nova metadata container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - nova_metadata
+                tripleo_delegate_to: "{{ groups['nova_metadata'] | default([]) }}"
       post_upgrade_tasks:
         - when: step|int == 1
           import_role:

deployment/nova/nova-scheduler-container-puppet.yaml

@@ -206,3 +206,18 @@ outputs:
           vars:
             containers_to_rm:
               - nova_scheduler
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop nova scheduler container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - nova_scheduler
+                tripleo_delegate_to: "{{ groups['nova_scheduler'] | default([]) }}"

deployment/nova/nova-vnc-proxy-container-puppet.yaml

@@ -310,3 +310,18 @@ outputs:
           vars:
             containers_to_rm:
               - nova_vnc_proxy
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop nova vnc proxy container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - nova_vnc_proxy
+                tripleo_delegate_to: "{{ groups['nova_vnc_proxy'] | default([]) }}"

deployment/pacemaker/clustercheck-container-puppet.yaml

@@ -104,3 +104,18 @@ outputs:
           vars:
             containers_to_rm:
               - clustercheck
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_transfer_data
+            - system_upgrade_stop_services
+          block:
+            - name: Stop clustercheck container
+              import_role:
+                name: tripleo-container-stop
+              vars:
+                tripleo_containers_to_stop:
+                  - clustercheck
+                tripleo_delegate_to: "{{ groups['clustercheck'] | default([]) }}"

puppet/services/pacemaker.yaml

@@ -257,6 +257,24 @@ outputs:
             - name: Start pacemaker cluster
               pacemaker_cluster: state=online
               when: not upgrade_leapp_enabled
+      external_upgrade_tasks:
+        - when:
+            - step|int == 1
+          tags:
+            - never
+            - system_upgrade_stop_services
+            - system_upgrade_transfer_data
+          block:
+            - name: Stop cluster
+              become: true
+              shell: |
+                set -eu
+                FILE=/usr/sbin/pcs
+                if test -f "$FILE"; then
+                  /usr/sbin/pcs cluster stop --force
+                fi
+              delegate_to: "{{ item }}"
+              with_items: "{{ groups['pacemaker'] | default([]) }}"
       update_tasks:
         - name: Check pacemaker cluster running before the minor update
           when: step|int == 0  # TODO(marios) disabling validations?