From 050d0ea066713f2fa90987b40ffe1c693f73b3e5 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Tue, 26 Mar 2024 18:17:05 +0100 Subject: [PATCH] Use new module names from openstack.cloud All of them have been renamed 4 years ago [1]. https: //review.opendev.org/c/openstack/ansible-collections-openstack/+/726538 Change-Id: I23525c35e3f6e4a4a611e97e01cab97750199aef --- ansible/library/kolla_toolbox.py | 2 +- ansible/roles/ceilometer/tasks/register.yml | 2 +- ansible/roles/keystone/tasks/register.yml | 2 +- ansible/roles/magnum/tasks/register.yml | 6 +++--- ansible/roles/octavia/tasks/get_resources_info.yml | 8 ++++---- ansible/roles/octavia/tasks/hm-interface.yml | 2 +- ansible/roles/octavia/tasks/prepare.yml | 14 +++++++------- ansible/roles/octavia/tasks/register.yml | 2 +- ansible/roles/service-ks-register/tasks/main.yml | 12 ++++++------ ansible/roles/swift/tasks/register.yml | 2 +- 10 files changed, 26 insertions(+), 26 deletions(-) diff --git a/ansible/library/kolla_toolbox.py b/ansible/library/kolla_toolbox.py index b3bc82dc42..552fb7834d 100644 --- a/ansible/library/kolla_toolbox.py +++ b/ansible/library/kolla_toolbox.py @@ -89,7 +89,7 @@ EXAMPLES = ''' - name: Creating default user role kolla_toolbox: container_engine: docker - module_name: os_keystone_role + module_name: openstack.cloud.identity_role module_args: name: member auth: "{{ '{{ openstack_keystone_auth }}' }}" diff --git a/ansible/roles/ceilometer/tasks/register.yml b/ansible/roles/ceilometer/tasks/register.yml index f44a6c6fd4..d4f0961b83 100644 --- a/ansible/roles/ceilometer/tasks/register.yml +++ b/ansible/roles/ceilometer/tasks/register.yml @@ -9,7 +9,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_user_role" + module_name: openstack.cloud.role_assignment module_args: project: "service" user: "{{ ceilometer_keystone_user }}" diff --git a/ansible/roles/keystone/tasks/register.yml b/ansible/roles/keystone/tasks/register.yml index d3b15fe6fd..733c3f903d 100644 --- a/ansible/roles/keystone/tasks/register.yml +++ b/ansible/roles/keystone/tasks/register.yml @@ -22,7 +22,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_role" + module_name: openstack.cloud.identity_role module_args: name: "{{ keystone_default_user_role }}" auth: "{{ openstack_keystone_auth }}" diff --git a/ansible/roles/magnum/tasks/register.yml b/ansible/roles/magnum/tasks/register.yml index 1d024041a4..a8b5165bed 100644 --- a/ansible/roles/magnum/tasks/register.yml +++ b/ansible/roles/magnum/tasks/register.yml @@ -10,7 +10,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_domain" + module_name: "openstack.cloud.identity_domain" module_args: name: "{{ magnum_trustee_domain }}" description: "Owns users and projects created by magnum" @@ -25,7 +25,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_user" + module_name: "openstack.cloud.identity_user" module_args: name: "{{ magnum_trustee_domain_admin }}" domain: "{{ magnum_trustee_domain }}" @@ -41,7 +41,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_user_role" + module_name: "openstack.cloud.role_assignment" module_args: domain: "{{ trustee_domain.domain.id }}" user: "{{ magnum_trustee_domain_admin }}" diff --git a/ansible/roles/octavia/tasks/get_resources_info.yml b/ansible/roles/octavia/tasks/get_resources_info.yml index 1576ea8b8d..ce6841d544 100644 --- a/ansible/roles/octavia/tasks/get_resources_info.yml +++ b/ansible/roles/octavia/tasks/get_resources_info.yml @@ -3,7 +3,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_flavor_info + module_name: openstack.cloud.compute_flavor_info module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -19,7 +19,7 @@ become: True kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_project_info + module_name: openstack.cloud.project_info module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -37,7 +37,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_security_group + module_name: openstack.cloud.security_group module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -57,7 +57,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_networks_info + module_name: openstack.cloud.networks_info module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" diff --git a/ansible/roles/octavia/tasks/hm-interface.yml b/ansible/roles/octavia/tasks/hm-interface.yml index 3af55b15ec..d1900cc2bb 100644 --- a/ansible/roles/octavia/tasks/hm-interface.yml +++ b/ansible/roles/octavia/tasks/hm-interface.yml @@ -3,7 +3,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_port + module_name: openstack.cloud.port module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" diff --git a/ansible/roles/octavia/tasks/prepare.yml b/ansible/roles/octavia/tasks/prepare.yml index f45bd5c5d2..b75bcd548b 100644 --- a/ansible/roles/octavia/tasks/prepare.yml +++ b/ansible/roles/octavia/tasks/prepare.yml @@ -3,7 +3,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_nova_flavor + module_name: openstack.cloud.compute_flavor module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -27,7 +27,7 @@ become: True kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_keypair + module_name: openstack.cloud.keypair module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -43,7 +43,7 @@ become: True kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_project_info + module_name: openstack.cloud.project_info module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -58,7 +58,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_security_group + module_name: openstack.cloud.security_group module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -78,7 +78,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_security_group_rule + module_name: openstack.cloud.security_group_rule module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -100,7 +100,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_network + module_name: openstack.cloud.network module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" @@ -122,7 +122,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: os_subnet + module_name: openstack.cloud.subnet module_args: auth: "{{ octavia_user_auth }}" cacert: "{{ openstack_cacert }}" diff --git a/ansible/roles/octavia/tasks/register.yml b/ansible/roles/octavia/tasks/register.yml index 454abcc037..7bf995e765 100644 --- a/ansible/roles/octavia/tasks/register.yml +++ b/ansible/roles/octavia/tasks/register.yml @@ -10,7 +10,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_role" + module_name: openstack.cloud.identity_role module_args: name: "{{ item }}" auth: "{{ openstack_octavia_auth }}" diff --git a/ansible/roles/service-ks-register/tasks/main.yml b/ansible/roles/service-ks-register/tasks/main.yml index 813ea26ff1..5620d6598e 100644 --- a/ansible/roles/service-ks-register/tasks/main.yml +++ b/ansible/roles/service-ks-register/tasks/main.yml @@ -3,7 +3,7 @@ - name: "{{ project_name }} | Creating services" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_service" + module_name: openstack.cloud.catalog_service module_args: name: "{{ item.name }}" service_type: "{{ item.type }}" @@ -24,7 +24,7 @@ - name: "{{ project_name }} | Creating endpoints" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_endpoint" + module_name: openstack.cloud.endpoint module_args: service: "{{ item.0.name }}" url: "{{ item.1.url }}" @@ -48,7 +48,7 @@ - name: "{{ project_name }} | Creating projects" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_project" + module_name: openstack.cloud.project module_args: name: "{{ item }}" domain: "{{ service_ks_register_domain }}" @@ -65,7 +65,7 @@ - name: "{{ project_name }} | Creating users" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_user" + module_name: openstack.cloud.identity_user module_args: default_project: "{{ item.project }}" name: "{{ item.user }}" @@ -87,7 +87,7 @@ - name: "{{ project_name }} | Creating roles" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_role" + module_name: openstack.cloud.identity_role module_args: name: "{{ item }}" region_name: "{{ service_ks_register_region_name }}" @@ -103,7 +103,7 @@ - name: "{{ project_name }} | Granting user roles" kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_user_role" + module_name: openstack.cloud.role_assignment module_args: user: "{{ item.user }}" role: "{{ item.role }}" diff --git a/ansible/roles/swift/tasks/register.yml b/ansible/roles/swift/tasks/register.yml index c6dcb02040..42d0f97c79 100644 --- a/ansible/roles/swift/tasks/register.yml +++ b/ansible/roles/swift/tasks/register.yml @@ -10,7 +10,7 @@ become: true kolla_toolbox: container_engine: "{{ kolla_container_engine }}" - module_name: "os_keystone_role" + module_name: openstack.cloud.identity_role module_args: name: "ResellerAdmin" region_name: "{{ openstack_region_name }}"