From 6403274fed8156b907921fbfc9ed6f3c12f3c935 Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Mon, 13 Apr 2026 07:53:31 +0200 Subject: Break out clouds.yaml/openrc creation from common role It currently only holds kolla-toolbox and due to introducing clouds.yaml for kolla-toolbox usage we should separate these two for readability. Change-Id: I0b4d3b8ab199260cd5087c10cf916f9d43f346cc Signed-off-by: Michal Nasiadka --- ansible/post-deploy.yml | 10 ++--- .../common/templates/admin-openrc-system.sh.j2 | 23 ---------- ansible/roles/common/templates/admin-openrc.sh.j2 | 25 ----------- ansible/roles/common/templates/clouds.yaml.j2 | 49 ---------------------- .../common/templates/public-openrc-system.sh.j2 | 15 ------- ansible/roles/common/templates/public-openrc.sh.j2 | 17 -------- ansible/templates/admin-openrc-system.sh.j2 | 23 ++++++++++ ansible/templates/admin-openrc.sh.j2 | 25 +++++++++++ ansible/templates/clouds.yaml.j2 | 49 ++++++++++++++++++++++ ansible/templates/public-openrc-system.sh.j2 | 15 +++++++ ansible/templates/public-openrc.sh.j2 | 17 ++++++++ zuul.d/scenarios/aio.yaml | 2 + zuul.d/scenarios/octavia.yaml | 1 + 13 files changed, 137 insertions(+), 134 deletions(-) delete mode 100644 ansible/roles/common/templates/admin-openrc-system.sh.j2 delete mode 100644 ansible/roles/common/templates/admin-openrc.sh.j2 delete mode 100644 ansible/roles/common/templates/clouds.yaml.j2 delete mode 100644 ansible/roles/common/templates/public-openrc-system.sh.j2 delete mode 100644 ansible/roles/common/templates/public-openrc.sh.j2 create mode 100644 ansible/templates/admin-openrc-system.sh.j2 create mode 100644 ansible/templates/admin-openrc.sh.j2 create mode 100644 ansible/templates/clouds.yaml.j2 create mode 100644 ansible/templates/public-openrc-system.sh.j2 create mode 100644 ansible/templates/public-openrc.sh.j2 diff --git a/ansible/post-deploy.yml b/ansible/post-deploy.yml index 6cd079814..af565e544 100644 --- a/ansible/post-deploy.yml +++ b/ansible/post-deploy.yml @@ -18,7 +18,7 @@ - name: Template out clouds.yaml become: "{{ needs_root }}" ansible.builtin.template: - src: "roles/common/templates/clouds.yaml.j2" + src: "templates/clouds.yaml.j2" dest: "{{ node_config }}/clouds.yaml" owner: "{{ ansible_facts.user_uid }}" group: "{{ ansible_facts.user_gid }}" @@ -30,7 +30,7 @@ - name: Template out admin-openrc.sh become: "{{ needs_root }}" ansible.builtin.template: - src: "roles/common/templates/admin-openrc.sh.j2" + src: "templates/admin-openrc.sh.j2" dest: "{{ node_config }}/admin-openrc.sh" owner: "{{ ansible_facts.user_uid }}" group: "{{ ansible_facts.user_gid }}" @@ -39,7 +39,7 @@ - name: Template out admin-openrc-system.sh become: "{{ needs_root }}" ansible.builtin.template: - src: "roles/common/templates/admin-openrc-system.sh.j2" + src: "templates/admin-openrc-system.sh.j2" dest: "{{ node_config }}/admin-openrc-system.sh" owner: "{{ ansible_facts.user_uid }}" group: "{{ ansible_facts.user_gid }}" @@ -48,7 +48,7 @@ - name: Template out public-openrc.sh become: "{{ needs_root }}" ansible.builtin.template: - src: "roles/common/templates/public-openrc.sh.j2" + src: "templates/public-openrc.sh.j2" dest: "{{ node_config }}/public-openrc.sh" owner: "{{ ansible_facts.user_uid }}" group: "{{ ansible_facts.user_gid }}" @@ -57,7 +57,7 @@ - name: Template out public-openrc-system.sh become: "{{ needs_root }}" ansible.builtin.template: - src: "roles/common/templates/public-openrc-system.sh.j2" + src: "templates/public-openrc-system.sh.j2" dest: "{{ node_config }}/public-openrc-system.sh" owner: "{{ ansible_facts.user_uid }}" group: "{{ ansible_facts.user_gid }}" diff --git a/ansible/roles/common/templates/admin-openrc-system.sh.j2 b/ansible/roles/common/templates/admin-openrc-system.sh.j2 deleted file mode 100644 index 6b4d95b96..000000000 --- a/ansible/roles/common/templates/admin-openrc-system.sh.j2 +++ /dev/null @@ -1,23 +0,0 @@ -# {{ ansible_managed }} - -# Clear any old environment that may conflict. -for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done -export OS_USER_DOMAIN_NAME='Default' -export OS_SYSTEM_SCOPE=all -export OS_USERNAME='{{ keystone_admin_user }}' -export OS_PASSWORD='{{ keystone_admin_password }}' -export OS_AUTH_URL='{{ keystone_internal_url }}' -export OS_INTERFACE='internal' -export OS_ENDPOINT_TYPE='internalURL' -{% if enable_manila | bool %} -export OS_MANILA_ENDPOINT_TYPE='internalURL' -{% endif %} -{% if enable_mistral | bool %} -export OS_MISTRAL_ENDPOINT_TYPE='internalURL' -{% endif %} -export OS_IDENTITY_API_VERSION='3' -export OS_REGION_NAME='{{ openstack_region_name }}' -export OS_AUTH_PLUGIN='password' -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} -export OS_CACERT='{{ kolla_admin_openrc_cacert }}' -{% endif %} diff --git a/ansible/roles/common/templates/admin-openrc.sh.j2 b/ansible/roles/common/templates/admin-openrc.sh.j2 deleted file mode 100644 index 367210639..000000000 --- a/ansible/roles/common/templates/admin-openrc.sh.j2 +++ /dev/null @@ -1,25 +0,0 @@ -# {{ ansible_managed }} - -# Clear any old environment that may conflict. -for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done -export OS_PROJECT_DOMAIN_NAME='Default' -export OS_USER_DOMAIN_NAME='Default' -export OS_PROJECT_NAME='{{ keystone_admin_project }}' -export OS_TENANT_NAME='{{ keystone_admin_project }}' -export OS_USERNAME='{{ keystone_admin_user }}' -export OS_PASSWORD='{{ keystone_admin_password }}' -export OS_AUTH_URL='{{ keystone_internal_url }}' -export OS_INTERFACE='internal' -export OS_ENDPOINT_TYPE='internalURL' -{% if enable_manila | bool %} -export OS_MANILA_ENDPOINT_TYPE='internalURL' -{% endif %} -{% if enable_mistral | bool %} -export OS_MISTRAL_ENDPOINT_TYPE='internalURL' -{% endif %} -export OS_IDENTITY_API_VERSION='3' -export OS_REGION_NAME='{{ openstack_region_name }}' -export OS_AUTH_PLUGIN='password' -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} -export OS_CACERT='{{ kolla_admin_openrc_cacert }}' -{% endif %} diff --git a/ansible/roles/common/templates/clouds.yaml.j2 b/ansible/roles/common/templates/clouds.yaml.j2 deleted file mode 100644 index 0485bedab..000000000 --- a/ansible/roles/common/templates/clouds.yaml.j2 +++ /dev/null @@ -1,49 +0,0 @@ -clouds: - kolla-admin: - auth: - auth_url: {{ keystone_public_url }} - project_domain_name: Default - user_domain_name: Default - project_name: {{ keystone_admin_project }} - username: {{ keystone_admin_user }} - password: {{ keystone_admin_password }} - region_name: {{ openstack_region_name }} -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} - cacert: {{ kolla_admin_openrc_cacert }} -{% endif %} - kolla-admin-system: - auth: - auth_url: {{ keystone_public_url }} - user_domain_name: Default - system_scope: all - username: {{ keystone_admin_user }} - password: {{ keystone_admin_password }} - region_name: {{ openstack_region_name }} -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} - cacert: {{ kolla_admin_openrc_cacert }} -{% endif %} - kolla-admin-internal: - auth: - auth_url: {{ keystone_internal_url }} - project_domain_name: Default - user_domain_name: Default - project_name: {{ keystone_admin_project }} - username: {{ keystone_admin_user }} - password: {{ keystone_admin_password }} - interface: internal - region_name: {{ openstack_region_name }} -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} - cacert: {{ kolla_admin_openrc_cacert }} -{% endif %} - kolla-admin-system-internal: - auth: - auth_url: {{ keystone_internal_url }} - user_domain_name: Default - system_scope: all - username: {{ keystone_admin_user }} - password: {{ keystone_admin_password }} - interface: internal - region_name: {{ openstack_region_name }} -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} - cacert: {{ kolla_admin_openrc_cacert }} -{% endif %} diff --git a/ansible/roles/common/templates/public-openrc-system.sh.j2 b/ansible/roles/common/templates/public-openrc-system.sh.j2 deleted file mode 100644 index 6c9f52f33..000000000 --- a/ansible/roles/common/templates/public-openrc-system.sh.j2 +++ /dev/null @@ -1,15 +0,0 @@ -# {{ ansible_managed }} - -# Clear any old environment that may conflict. -for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done -export OS_USER_DOMAIN_NAME=Default -export OS_SYSTEM_SCOPE=all -export OS_USERNAME={{ keystone_admin_user }} -export OS_PASSWORD={{ keystone_admin_password }} -export OS_AUTH_URL={{ keystone_public_url }} -export OS_IDENTITY_API_VERSION=3 -export OS_REGION_NAME={{ openstack_region_name }} -export OS_AUTH_PLUGIN=password -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} -export OS_CACERT={{ kolla_admin_openrc_cacert }} -{% endif %} diff --git a/ansible/roles/common/templates/public-openrc.sh.j2 b/ansible/roles/common/templates/public-openrc.sh.j2 deleted file mode 100644 index b268a8b97..000000000 --- a/ansible/roles/common/templates/public-openrc.sh.j2 +++ /dev/null @@ -1,17 +0,0 @@ -# {{ ansible_managed }} - -# Clear any old environment that may conflict. -for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done -export OS_PROJECT_DOMAIN_NAME=Default -export OS_USER_DOMAIN_NAME=Default -export OS_PROJECT_NAME={{ keystone_admin_project }} -export OS_TENANT_NAME={{ keystone_admin_project }} -export OS_USERNAME={{ keystone_admin_user }} -export OS_PASSWORD={{ keystone_admin_password }} -export OS_AUTH_URL={{ keystone_public_url }} -export OS_IDENTITY_API_VERSION=3 -export OS_REGION_NAME={{ openstack_region_name }} -export OS_AUTH_PLUGIN=password -{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} -export OS_CACERT={{ kolla_admin_openrc_cacert }} -{% endif %} diff --git a/ansible/templates/admin-openrc-system.sh.j2 b/ansible/templates/admin-openrc-system.sh.j2 new file mode 100644 index 000000000..6b4d95b96 --- /dev/null +++ b/ansible/templates/admin-openrc-system.sh.j2 @@ -0,0 +1,23 @@ +# {{ ansible_managed }} + +# Clear any old environment that may conflict. +for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done +export OS_USER_DOMAIN_NAME='Default' +export OS_SYSTEM_SCOPE=all +export OS_USERNAME='{{ keystone_admin_user }}' +export OS_PASSWORD='{{ keystone_admin_password }}' +export OS_AUTH_URL='{{ keystone_internal_url }}' +export OS_INTERFACE='internal' +export OS_ENDPOINT_TYPE='internalURL' +{% if enable_manila | bool %} +export OS_MANILA_ENDPOINT_TYPE='internalURL' +{% endif %} +{% if enable_mistral | bool %} +export OS_MISTRAL_ENDPOINT_TYPE='internalURL' +{% endif %} +export OS_IDENTITY_API_VERSION='3' +export OS_REGION_NAME='{{ openstack_region_name }}' +export OS_AUTH_PLUGIN='password' +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} +export OS_CACERT='{{ kolla_admin_openrc_cacert }}' +{% endif %} diff --git a/ansible/templates/admin-openrc.sh.j2 b/ansible/templates/admin-openrc.sh.j2 new file mode 100644 index 000000000..367210639 --- /dev/null +++ b/ansible/templates/admin-openrc.sh.j2 @@ -0,0 +1,25 @@ +# {{ ansible_managed }} + +# Clear any old environment that may conflict. +for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done +export OS_PROJECT_DOMAIN_NAME='Default' +export OS_USER_DOMAIN_NAME='Default' +export OS_PROJECT_NAME='{{ keystone_admin_project }}' +export OS_TENANT_NAME='{{ keystone_admin_project }}' +export OS_USERNAME='{{ keystone_admin_user }}' +export OS_PASSWORD='{{ keystone_admin_password }}' +export OS_AUTH_URL='{{ keystone_internal_url }}' +export OS_INTERFACE='internal' +export OS_ENDPOINT_TYPE='internalURL' +{% if enable_manila | bool %} +export OS_MANILA_ENDPOINT_TYPE='internalURL' +{% endif %} +{% if enable_mistral | bool %} +export OS_MISTRAL_ENDPOINT_TYPE='internalURL' +{% endif %} +export OS_IDENTITY_API_VERSION='3' +export OS_REGION_NAME='{{ openstack_region_name }}' +export OS_AUTH_PLUGIN='password' +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} +export OS_CACERT='{{ kolla_admin_openrc_cacert }}' +{% endif %} diff --git a/ansible/templates/clouds.yaml.j2 b/ansible/templates/clouds.yaml.j2 new file mode 100644 index 000000000..0485bedab --- /dev/null +++ b/ansible/templates/clouds.yaml.j2 @@ -0,0 +1,49 @@ +clouds: + kolla-admin: + auth: + auth_url: {{ keystone_public_url }} + project_domain_name: Default + user_domain_name: Default + project_name: {{ keystone_admin_project }} + username: {{ keystone_admin_user }} + password: {{ keystone_admin_password }} + region_name: {{ openstack_region_name }} +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} + cacert: {{ kolla_admin_openrc_cacert }} +{% endif %} + kolla-admin-system: + auth: + auth_url: {{ keystone_public_url }} + user_domain_name: Default + system_scope: all + username: {{ keystone_admin_user }} + password: {{ keystone_admin_password }} + region_name: {{ openstack_region_name }} +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} + cacert: {{ kolla_admin_openrc_cacert }} +{% endif %} + kolla-admin-internal: + auth: + auth_url: {{ keystone_internal_url }} + project_domain_name: Default + user_domain_name: Default + project_name: {{ keystone_admin_project }} + username: {{ keystone_admin_user }} + password: {{ keystone_admin_password }} + interface: internal + region_name: {{ openstack_region_name }} +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} + cacert: {{ kolla_admin_openrc_cacert }} +{% endif %} + kolla-admin-system-internal: + auth: + auth_url: {{ keystone_internal_url }} + user_domain_name: Default + system_scope: all + username: {{ keystone_admin_user }} + password: {{ keystone_admin_password }} + interface: internal + region_name: {{ openstack_region_name }} +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} + cacert: {{ kolla_admin_openrc_cacert }} +{% endif %} diff --git a/ansible/templates/public-openrc-system.sh.j2 b/ansible/templates/public-openrc-system.sh.j2 new file mode 100644 index 000000000..6c9f52f33 --- /dev/null +++ b/ansible/templates/public-openrc-system.sh.j2 @@ -0,0 +1,15 @@ +# {{ ansible_managed }} + +# Clear any old environment that may conflict. +for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done +export OS_USER_DOMAIN_NAME=Default +export OS_SYSTEM_SCOPE=all +export OS_USERNAME={{ keystone_admin_user }} +export OS_PASSWORD={{ keystone_admin_password }} +export OS_AUTH_URL={{ keystone_public_url }} +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME={{ openstack_region_name }} +export OS_AUTH_PLUGIN=password +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} +export OS_CACERT={{ kolla_admin_openrc_cacert }} +{% endif %} diff --git a/ansible/templates/public-openrc.sh.j2 b/ansible/templates/public-openrc.sh.j2 new file mode 100644 index 000000000..b268a8b97 --- /dev/null +++ b/ansible/templates/public-openrc.sh.j2 @@ -0,0 +1,17 @@ +# {{ ansible_managed }} + +# Clear any old environment that may conflict. +for key in $( set | awk '{FS="="} /^OS_/ {print $1}' ); do unset $key ; done +export OS_PROJECT_DOMAIN_NAME=Default +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_NAME={{ keystone_admin_project }} +export OS_TENANT_NAME={{ keystone_admin_project }} +export OS_USERNAME={{ keystone_admin_user }} +export OS_PASSWORD={{ keystone_admin_password }} +export OS_AUTH_URL={{ keystone_public_url }} +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME={{ openstack_region_name }} +export OS_AUTH_PLUGIN=password +{% if kolla_admin_openrc_cacert is not none and kolla_admin_openrc_cacert | length > 0 %} +export OS_CACERT={{ kolla_admin_openrc_cacert }} +{% endif %} diff --git a/zuul.d/scenarios/aio.yaml b/zuul.d/scenarios/aio.yaml index 4a89a11a7..95fa0a9e0 100644 --- a/zuul.d/scenarios/aio.yaml +++ b/zuul.d/scenarios/aio.yaml @@ -3,10 +3,12 @@ parent: kolla-ansible-base name: kolla-ansible-aio-base files: !inherit + - ^ansible/post-deploy.yml - ^ansible/group_vars/all/(common|cron|fluentd|glance|haproxy|heat|horizon|keepalived|keystone|loadbalancer|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq).yml - ^ansible/group_vars/baremetal/ansible-python-interpreter.yml - ^ansible/(action_plugins|filter_plugins|library|module_utils)/ - ^ansible/roles/(common|cron|fluentd|glance|haproxy-config|heat|horizon|keystone|loadbalancer|loadbalancer-config|neutron|nova|nova-cell|openvswitch|placement|proxysql|rabbitmq|service.*)/ + - ^ansible/templates/ - ^kolla_ansible/ - ^roles/kolla-ansible-(deploy|tempest|test-dashboard|reconfigure)/ - ^tests/testinfra/test_horizon.py diff --git a/zuul.d/scenarios/octavia.yaml b/zuul.d/scenarios/octavia.yaml index 5625e63cf..8a0e716cd 100644 --- a/zuul.d/scenarios/octavia.yaml +++ b/zuul.d/scenarios/octavia.yaml @@ -4,6 +4,7 @@ parent: kolla-ansible-base voting: false files: !inherit + - ^ansible/post-deploy.yml - ^ansible/group_vars/all/(octavia|valkey).yml - ^ansible/roles/(octavia|octavia-certificates|valkey)/ - ^tests/test-octavia.sh -- cgit v1.2.3