kolla: Expose image selection and select images
Change-Id: Ic5f9031c2ad103547828dc31dc6066971ff9ff1f
diff --git a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/globals.yml.j2 b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/globals.yml.j2
index 92ce683..ef1f588 100644
--- a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/globals.yml.j2
+++ b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/globals.yml.j2
@@ -13,5 +13,5 @@
# The proper solution is to mirror the upstream images
# from quay.io to cts.storpool.com, and configure kolla-ansible
# to use cts.storpool.com for all images.
-nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy.20230614.1"
-cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy"
+nova_compute_image_full: "{{ kolla_nova_compute_image_full }}"
+cinder_volume_image_full: "{{ kolla_cinder_volume_image_full }}"
diff --git a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml
index e811410..826b0c5 100644
--- a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml
+++ b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml
@@ -7,6 +7,9 @@
#kolla_neutron_external_interface: "enp5s0"
kolla_kolla_internal_vip_address: "192.168.60.250"
+kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy.20230614.1"
+kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy"
+
undercloud_client_node: "{{ hostvars['undercloud-client']['nodepool']['external_id'] }}"
openstack_node: "{{ hostvars['controller']['nodepool']['external_id'] }}"
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index 710e0bb..efd908d 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -267,6 +267,8 @@
zuul_copy_output:
/etc/multipath.conf: logs_txt
/etc/iscsi/iscsid.conf: logs_txt
+ kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:zed-ubuntu-jammy-pre-release"
+ kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:zed-ubuntu-jammy-pre-release"
tempest_test_regex: volume
- project: