From 1f7de63e5bbeedd23609aa2f2c1552f5f4f51c43 Mon Sep 17 00:00:00 2001 From: Sagi Shnaidman Date: Wed, 26 May 2021 17:27:10 +0300 Subject: [PATCH] Use collection FQCN for podman modules Replace modules for containers.podman and openstack.cloud Change-Id: Ia7478fc82ce532bf60a07cba395c5652a6200a8d --- deployment/cinder/cinder-api-container-puppet.yaml | 2 +- deployment/database/mysql-container-puppet.yaml | 2 +- deployment/keystone/keystone-container-puppet.yaml | 2 +- deployment/nova/nova-api-container-puppet.yaml | 2 +- deployment/nova/nova-compute-container-puppet.yaml | 2 +- deployment/nova/nova-conductor-container-puppet.yaml | 2 +- deployment/nova/nova-libvirt-container-puppet.yaml | 2 +- deployment/nova/nova-metadata-container-puppet.yaml | 2 +- deployment/nova/nova-migration-target-container-puppet.yaml | 2 +- deployment/nova/nova-scheduler-container-puppet.yaml | 2 +- deployment/nova/nova-vnc-proxy-container-puppet.yaml | 2 +- deployment/podman/podman-baremetal-ansible.yaml | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/deployment/cinder/cinder-api-container-puppet.yaml b/deployment/cinder/cinder-api-container-puppet.yaml index 102cd08419..abd7bf13eb 100644 --- a/deployment/cinder/cinder-api-container-puppet.yaml +++ b/deployment/cinder/cinder-api-container-puppet.yaml @@ -394,7 +394,7 @@ outputs: external_deploy_tasks: - name: Clean up legacy Cinder keystone catalog entries become: true - os_keystone_service: + openstack.cloud.catalog_service: cloud: {get_param: RootStackName} name: "{{ item.service_name }}" service_type: "{{ item.service_type }}" diff --git a/deployment/database/mysql-container-puppet.yaml b/deployment/database/mysql-container-puppet.yaml index bcd7ff9beb..333cbd5f1d 100644 --- a/deployment/database/mysql-container-puppet.yaml +++ b/deployment/database/mysql-container-puppet.yaml @@ -273,7 +273,7 @@ outputs: when: step|int == 2 block: - name: Get Mysql container image name before upgrade - podman_container_info: + containers.podman.podman_container_info: name: mysql register: mysql_infos - name: Set fact for Mysql container image before upgrade diff --git a/deployment/keystone/keystone-container-puppet.yaml b/deployment/keystone/keystone-container-puppet.yaml index ae57e6b26d..9c27a3be5d 100644 --- a/deployment/keystone/keystone-container-puppet.yaml +++ b/deployment/keystone/keystone-container-puppet.yaml @@ -821,7 +821,7 @@ outputs: list_concat: - get_attr: [ApacheServiceBase, role_data, deploy_steps_tasks] - - name: validate keystone container state - podman_container_info: + containers.podman.podman_container_info: name: keystone register: keystone_infos failed_when: diff --git a/deployment/nova/nova-api-container-puppet.yaml b/deployment/nova/nova-api-container-puppet.yaml index 929638ebd3..063f2d99c9 100644 --- a/deployment/nova/nova-api-container-puppet.yaml +++ b/deployment/nova/nova-api-container-puppet.yaml @@ -646,7 +646,7 @@ outputs: list_concat: - get_attr: [ApacheServiceBase, role_data, deploy_steps_tasks] - - name: validate nova-api container state - podman_container_info: + containers.podman.podman_container_info: name: nova_api register: nova_api_infos failed_when: diff --git a/deployment/nova/nova-compute-container-puppet.yaml b/deployment/nova/nova-compute-container-puppet.yaml index c219590c46..ae6293ea66 100644 --- a/deployment/nova/nova-compute-container-puppet.yaml +++ b/deployment/nova/nova-compute-container-puppet.yaml @@ -1593,7 +1593,7 @@ outputs: enabled: no deploy_steps_tasks: - name: validate nova-compute container state - podman_container_info: + containers.podman.podman_container_info: name: nova_compute register: nova_compute_infos failed_when: diff --git a/deployment/nova/nova-conductor-container-puppet.yaml b/deployment/nova/nova-conductor-container-puppet.yaml index eae55dac9c..0468c72ee8 100644 --- a/deployment/nova/nova-conductor-container-puppet.yaml +++ b/deployment/nova/nova-conductor-container-puppet.yaml @@ -207,7 +207,7 @@ outputs: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS deploy_steps_tasks: - name: validate nova-conductor container state - podman_container_info: + containers.podman.podman_container_info: name: nova_conductor register: nova_conductor_infos failed_when: diff --git a/deployment/nova/nova-libvirt-container-puppet.yaml b/deployment/nova/nova-libvirt-container-puppet.yaml index c706c487cf..0befc60bbf 100644 --- a/deployment/nova/nova-libvirt-container-puppet.yaml +++ b/deployment/nova/nova-libvirt-container-puppet.yaml @@ -743,7 +743,7 @@ outputs: deploy_steps_tasks: list_concat: - - name: validate nova-libvirt container state - podman_container_info: + containers.podman.podman_container_info: name: nova_libvirt register: nova_libvirt_infos failed_when: diff --git a/deployment/nova/nova-metadata-container-puppet.yaml b/deployment/nova/nova-metadata-container-puppet.yaml index 73050b3e76..afa8c0f950 100644 --- a/deployment/nova/nova-metadata-container-puppet.yaml +++ b/deployment/nova/nova-metadata-container-puppet.yaml @@ -265,7 +265,7 @@ outputs: list_concat: - get_attr: [ApacheServiceBase, role_data, deploy_steps_tasks] - - name: validate nova-metadata container state - podman_container_info: + containers.podman.podman_container_info: name: nova_metadata register: nova_metadata_infos failed_when: diff --git a/deployment/nova/nova-migration-target-container-puppet.yaml b/deployment/nova/nova-migration-target-container-puppet.yaml index 19f186999e..9f2fffb057 100644 --- a/deployment/nova/nova-migration-target-container-puppet.yaml +++ b/deployment/nova/nova-migration-target-container-puppet.yaml @@ -182,7 +182,7 @@ outputs: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS deploy_steps_tasks: - name: validate nova-migration-target container state - podman_container_info: + containers.podman.podman_container_info: name: nova_migration_target register: nova_migration_target_infos failed_when: diff --git a/deployment/nova/nova-scheduler-container-puppet.yaml b/deployment/nova/nova-scheduler-container-puppet.yaml index e313891932..8bafd8574c 100644 --- a/deployment/nova/nova-scheduler-container-puppet.yaml +++ b/deployment/nova/nova-scheduler-container-puppet.yaml @@ -284,7 +284,7 @@ outputs: KOLLA_CONFIG_STRATEGY: COPY_ALWAYS deploy_steps_tasks: - name: validate nova-scheduler container state - podman_container_info: + containers.podman.podman_container_info: name: nova_scheduler register: nova_scheduler_infos failed_when: diff --git a/deployment/nova/nova-vnc-proxy-container-puppet.yaml b/deployment/nova/nova-vnc-proxy-container-puppet.yaml index 6e211beaa4..d9e1fd7d28 100644 --- a/deployment/nova/nova-vnc-proxy-container-puppet.yaml +++ b/deployment/nova/nova-vnc-proxy-container-puppet.yaml @@ -307,7 +307,7 @@ outputs: deploy_steps_tasks: list_concat: - - name: validate nova-vnc-proxy container state - podman_container_info: + containers.podman.podman_container_info: name: nova_vnc_proxy register: nova_vnc_proxy_infos failed_when: diff --git a/deployment/podman/podman-baremetal-ansible.yaml b/deployment/podman/podman-baremetal-ansible.yaml index 1cd2aa606c..ada92b9f37 100644 --- a/deployment/podman/podman-baremetal-ansible.yaml +++ b/deployment/podman/podman-baremetal-ansible.yaml @@ -152,7 +152,7 @@ outputs: # undercloud registry. - name: Pre-fetch all the containers become: true - podman_image: + containers.podman.podman_image: name: "{{ prefetch_image }}" validate_certs: false force: true