Overwrite more kolla variables in jobs
Change-Id: I7c521a9c4899e230348ef5bb173faff14c789202
diff --git a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml
index 6377a32..4120243 100644
--- a/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml
+++ b/playbooks/kolla-setup-openstack-iscsi-multipath-storpool/vars.yaml
@@ -1,13 +1,12 @@
-kolla_ansible_version: "16.2.0"
-
kolla_venv: "{{ ansible_env.HOME }}/kolla-venv"
tempest_venv: "{{ ansible_env.HOME }}/tempest-venv"
kolla_kolla_base_distro: "ubuntu"
-kolla_openstack_release: "zed"
kolla_kolla_internal_vip_address: "192.168.60.250"
# TODO: Add defaults
+#kolla_ansible_version: "16.2.0"
+#kolla_openstack_release: "zed"
#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"
diff --git a/zuul.d/sp-cinder.yaml b/zuul.d/sp-cinder.yaml
index e9cb96f..39112c0 100644
--- a/zuul.d/sp-cinder.yaml
+++ b/zuul.d/sp-cinder.yaml
@@ -352,6 +352,8 @@
vars:
sp_target_release: "testing"
+ kolla_ansible_version: "16.2.0"
+ kolla_openstack_release: "zed"
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"
@@ -361,6 +363,8 @@
vars:
sp_target_release: "testing"
+ kolla_ansible_version: "stable/2023.2"
+ kolla_openstack_release: "2023.2"
kolla_nova_compute_image_full: "cts.storpool.com/kolla/ubuntu-binary-nova-compute:2023.2-ubuntu-jammy-pre-release"
kolla_cinder_volume_image_full: "cts.storpool.com/kolla/ubuntu-binary-cinder-volume:2023.2-ubuntu-jammy-pre-release"