openstack
/
kolla-ansible
Code Issues Proposed changes

[CI] Remove reliance on install_type 

With the install_type going away and actually removed from job
definitions, we have to stop relying on it - to fix otherwise
broken jobs (swift and when doing kolla builds with k-a).

Change-Id: If13c4e276d3eec29a552ed229af95f5cf016100c
This commit is contained in:
Radosław Piliszek 2022-04-12 22:03:22 +02:00
parent 259a5fc308
commit e380cdd226
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/run.yml
View File

@ -58,7 +58,6 @@
# buster see https://github.com/docker/for-linux/issues/711.
push: "{{ base_distro != 'debian' }}"
base: "{{ base_distro }}"
install_type: "{{ install_type }}"
registry: "127.0.0.1:4000"
namespace: lokolla
tag: "{{ build_image_tag }}"
@ -334,7 +333,8 @@
executable: /bin/bash
chdir: "{{ kolla_ansible_src_dir }}"
environment:
KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}{{ base_distro }}-{{ install_type }}-swift-base:{{ docker_image_tag }}"
# TODO(yoctozepto): Remove hardcoded "source" when Kolla omits this part.
KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}{{ base_distro }}-source-swift-base:{{ docker_image_tag }}"
# NOTE(yoctozepto): no IPv6 for now
STORAGE_NODES: "{{ groups['all'] | map('extract', hostvars,
['ansible_'+api_interface_name, 'ipv4', 'address'])