Merge "Break out clouds.yaml/openrc creation from common role"

8 files changed, 8 insertions, 5 deletions

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/templates/admin-openrc-system.sh.j2
index 6b4d95b96..6b4d95b96 100644
--- a/ansible/roles/common/templates/admin-openrc-system.sh.j2
+++ b/ansible/templates/admin-openrc-system.sh.j2
diff --git a/ansible/roles/common/templates/admin-openrc.sh.j2 b/ansible/templates/admin-openrc.sh.j2
index 367210639..367210639 100644
--- a/ansible/roles/common/templates/admin-openrc.sh.j2
+++ b/ansible/templates/admin-openrc.sh.j2
diff --git a/ansible/roles/common/templates/clouds.yaml.j2 b/ansible/templates/clouds.yaml.j2
index 0485bedab..0485bedab 100644
--- a/ansible/roles/common/templates/clouds.yaml.j2
+++ b/ansible/templates/clouds.yaml.j2
diff --git a/ansible/roles/common/templates/public-openrc-system.sh.j2 b/ansible/templates/public-openrc-system.sh.j2
index 6c9f52f33..6c9f52f33 100644
--- a/ansible/roles/common/templates/public-openrc-system.sh.j2
+++ b/ansible/templates/public-openrc-system.sh.j2
diff --git a/ansible/roles/common/templates/public-openrc.sh.j2 b/ansible/templates/public-openrc.sh.j2
index b268a8b97..b268a8b97 100644
--- a/ansible/roles/common/templates/public-openrc.sh.j2
+++ b/ansible/templates/public-openrc.sh.j2
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