openstack/kolla-ansible
Code Issues Proposed changes

Merge "Use new module names from openstack.cloud"

Browse Source
This commit is contained in:
Zuul 2024-11-16 00:35:25 +00:00 committed by Gerrit Code Review
commit e1013a7f84
10 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/library/kolla_toolbox.py
View File

@ -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 }}' }}"

2
ansible/roles/ceilometer/tasks/register.yml
View File

@ -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 }}"

2
ansible/roles/keystone/tasks/register.yml
View File

@ -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 }}"

6
ansible/roles/magnum/tasks/register.yml
View File

@ -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 }}"

8
ansible/roles/octavia/tasks/get_resources_info.yml
View File

@ -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 }}"

2
ansible/roles/octavia/tasks/hm-interface.yml
View File

@ -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 }}"

14
ansible/roles/octavia/tasks/prepare.yml
View File

@ -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 }}"

2
ansible/roles/octavia/tasks/register.yml
View File

@ -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 }}"

12
ansible/roles/service-ks-register/tasks/main.yml
View File

@ -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 }}"

2
ansible/roles/swift/tasks/register.yml
View File

@ -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 }}"