Merge "Remove old non-ha container removal tasks"

2021-11-04 17:51:18 +00:00 · 2021-11-04 17:51:18 +00:00 · bd83eb9267
commit bd83eb9267
parent 8e5e6a8281 52ed0f05b8
9 changed files with 0 additions and 157 deletions
--- a/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-backup-pacemaker-puppet.yaml
@ -191,17 +191,6 @@ outputs:
                tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}

      update_tasks:
-        - name: Tear-down non-HA cinder-backup container
-          when:
-            - step|int == 1
-          block: &cinder_backup_teardown_nonha
-            - name: Remove non-HA cinder-backup container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - cinder_backup
        - name: cinder_backup fetch and retag container image for pacemaker
          when: step|int == 2
          block: &cinder_backup_fetch_retag_container_tasks
@ -239,10 +228,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA cinder_backup container
-          when:
-            - step|int == 0
-          block: *cinder_backup_teardown_nonha
        - name: Prepare switch of cinder_backup image name
          when:
            - step|int == 0
--- a/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
+++ b/deployment/cinder/cinder-volume-pacemaker-puppet.yaml
@ -180,17 +180,6 @@ outputs:
                tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}

      update_tasks:
-        - name: Tear-down non-HA cinder_volume container
-          when:
-            - step|int == 1
-          block: &cinder_volume_teardown_nonha
-            - name: Remove non-HA cinder_volume container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - cinder_volume
        - name: cinder_volume fetch and retag container image for pacemaker
          when: step|int == 2
          block: &cinder_volume_fetch_retag_container_tasks
@ -228,10 +217,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA cinder_volume container
-          when:
-            - step|int == 0
-          block: *cinder_volume_teardown_nonha
        - name: Prepare switch of cinder_volume image name
          when:
            - step|int == 0
--- a/deployment/database/mysql-pacemaker-puppet.yaml
+++ b/deployment/database/mysql-pacemaker-puppet.yaml
@ -323,37 +323,6 @@ outputs:
                    tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}

      update_tasks:
-        - name: Tear-down non-HA mysql container
-          when:
-            - step|int == 1
-          block: &mysql_teardown_nonha
-            - name: "stat mysql container"
-              command: "podman container exists mysql"
-              failed_when: false
-              changed_when: false
-              register: stat_mysql_container
-            - name: Create clustercheck user and permissions
-              command:
-                argv: "{{ mysql_exec_data | container_exec_cmd }}"
-              changed_when: true
-              when:
-                - stat_mysql_container.rc == 0
-              vars:
-                mysql_exec_data:
-                  environment:
-                    CLUSTERCHECK_PASSWORD: {get_param: MysqlClustercheckPassword}
-                  command:
-                    - 'mysql'
-                    - '/bin/sh'
-                    - '-c'
-                    - mysql -e "CREATE USER IF NOT EXISTS 'clustercheck'@'localhost' IDENTIFIED BY '${CLUSTERCHECK_PASSWORD}'; GRANT PROCESS ON *.* TO 'clustercheck'@'localhost' WITH GRANT OPTION;"
-            - name: Remove non-HA mysql container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - mysql
        - name: Mariadb fetch and retag container image for pacemaker
          when: step|int == 2
          block: &mysql_fetch_retag_container_tasks
@ -396,10 +365,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA mysql container
-          when:
-            - step|int == 0
-          block: *mysql_teardown_nonha
        - vars:
            mysql_upgrade_persist: {get_param: MysqlUpgradePersist}
          when:
--- a/deployment/database/redis-pacemaker-puppet.yaml
+++ b/deployment/database/redis-pacemaker-puppet.yaml
@ -306,17 +306,6 @@ outputs:
              file:
                path: /etc/tmpfiles.d/var-run-redis.conf
                state: absent
-        - name: Tear-down non-HA redis container
-          when:
-            - step|int == 1
-          block: &redis_teardown_nonha
-            - name: Remove non-HA redis container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - redis
        - name: Redis fetch and retag container image for pacemaker
          when: step|int == 2
          block: &redis_fetch_retag_container_tasks
@ -357,10 +346,6 @@ outputs:
        - name: redis_pacemaker_puppet_tmpfile_cleanup
          when: step|int == 1
          block: *redis_pacemaker_puppet_tmpfile_cleanup
-        - name: Tear-down non-HA redis container
-          when:
-            - step|int == 0
-          block: *redis_teardown_nonha
        - name: Prepare switch of redis image name
          when:
            - step|int == 0
--- a/deployment/haproxy/haproxy-pacemaker-puppet.yaml
+++ b/deployment/haproxy/haproxy-pacemaker-puppet.yaml
@ -341,17 +341,6 @@ outputs:
            - {get_param: EnableInternalTLS}
            - get_attr: [HAProxyInternalTLS, role_data, deploy_steps_tasks]
      update_tasks:
-        - name: Tear-down non-HA haproxy container
-          when:
-            - step|int == 1
-          block: &haproxy_teardown_nonha
-            - name: Remove non-HA haproxy container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - haproxy
        - name: Set HAProxy upgrade facts
          block: &haproxy_update_upgrade_facts
          - name: set is_haproxy_bootstrap_node fact
@ -432,10 +421,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA haproxy container
-          when:
-            - step|int == 0
-          block: *haproxy_teardown_nonha
        - name: Prepare switch of haproxy image name
          when:
            - step|int == 0
--- a/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
+++ b/deployment/ovn/ovn-dbs-pacemaker-puppet.yaml
@ -269,19 +269,6 @@ outputs:
                        - {get_param: CertificateKeySize}
                    ca: ipa
      update_tasks:
-        - name: Tear-down non-HA ovn-dbs containers
-          when:
-            - step|int == 1
-          block: &ovn_dbs_teardown_nonha
-            - name: Remove non-HA ovn-dbs containers
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - ovn_north_db_server
-                  - ovn_south_db_server
-                  - ovn_northd
        - name: ovn-dbs fetch and retag container image for pacemaker
          when:
            - step|int == 3
@ -339,10 +326,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA ovn-dbs container
-          when:
-            - step|int == 0
-          block: *ovn_dbs_teardown_nonha
        - name: Prepare switch of ovn-dbs image name
          when:
            - step|int == 0
--- a/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-notify-pacemaker-puppet.yaml
@ -256,17 +256,6 @@ outputs:
                    tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}

      update_tasks:
-        - name: Tear-down non-HA rabbitmq container
-          when:
-            - step|int == 1
-          block: &rabbitmq_teardown_nonha
-            - name: Remove non-HA rabbitmq container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - rabbitmq
        - name: Rabbit fetch and retag container image for pacemaker
          when: step|int == 2
          block: &rabbitmq_fetch_retag_container_tasks
@ -304,10 +293,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA rabbitmq container
-          when:
-            - step|int == 0
-          block: *rabbitmq_teardown_nonha
        - name: Prepare switch of rabbitmq image name
          when:
            - step|int == 0
--- a/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-pacemaker-puppet.yaml
@ -261,17 +261,6 @@ outputs:
                    tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}

      update_tasks:
-        - name: Tear-down non-HA rabbitmq container
-          when:
-            - step|int == 1
-          block: &rabbitmq_teardown_nonha
-            - name: Remove non-HA rabbitmq container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - rabbitmq
        - name: Rabbit fetch and retag container image for pacemaker
          when: step|int == 2
          block: &rabbitmq_fetch_retag_container_tasks
@ -309,10 +298,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA rabbitmq container
-          when:
-            - step|int == 0
-          block: *rabbitmq_teardown_nonha
        - name: Prepare switch of rabbitmq image name
          when:
            - step|int == 0
--- a/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
+++ b/deployment/rabbitmq/rabbitmq-messaging-rpc-pacemaker-puppet.yaml
@ -261,17 +261,6 @@ outputs:
                    tripleo_ha_wrapper_puppet_debug: {get_param: ConfigDebug}

      update_tasks:
-        - name: Tear-down non-HA rabbitmq container
-          when:
-            - step|int == 1
-          block: &rabbitmq_teardown_nonha
-            - name: Remove non-HA rabbitmq container
-              include_role:
-                name: tripleo_container_rm
-              vars:
-                tripleo_container_cli: "{{ container_cli }}"
-                tripleo_containers_to_rm:
-                  - rabbitmq
        - name: Rabbit fetch and retag container image for pacemaker
          when: step|int == 2
          block: &rabbitmq_fetch_retag_container_tasks
@ -309,10 +298,6 @@ outputs:
            tripleo_ha_wrapper_minor_update: true

      upgrade_tasks:
-        - name: Tear-down non-HA rabbitmq container
-          when:
-            - step|int == 0
-          block: *rabbitmq_teardown_nonha
        - name: Prepare switch of rabbitmq image name
          when:
            - step|int == 0