openstack/kolla-ansible
Code Issues Proposed changes

CI: Fix init-swift

Browse Source 
Container image naming scheme has changed

Change-Id: I775ea3f796290c670e4b04640f4429304dae609c
This commit is contained in:
Michal Nasiadka 2022-09-21 12:29:23 +02:00 committed by Radosław Piliszek
parent e8887c2cec
commit 35f90a31eb
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/run.yml
View File

@ -287,11 +287,12 @@
shell: shell:
cmd: "{{ kolla_ansible_venv_path }}/bin/ansible all -i {{ kolla_inventory_path }} -m setup > /tmp/logs/ansible/initial-setup" cmd: "{{ kolla_ansible_venv_path }}/bin/ansible all -i {{ kolla_inventory_path }} -m setup > /tmp/logs/ansible/initial-setup"
- name: Set facts for actions - name: Set facts for Swift initialisation
set_fact: set_fact:
# NOTE(yoctozepto): no support for upgrades for now # NOTE(yoctozepto): no support for upgrades for now
docker_image_tag: "{{ build_image_tag if need_build_image else (zuul.branch | basename) ~ docker_image_tag_suffix }}" docker_image_tag: "{{ build_image_tag if need_build_image else (zuul.branch | basename) ~ '-' ~ base_distro ~ '-' ~ base_distro_version ~ docker_image_tag_suffix }}"
docker_image_prefix: "{{ 'primary:4000/lokolla/' if need_build_image else '{{ zuul_site_mirror_fqdn }}:4447/openstack.kolla/' }}" docker_image_prefix: "{{ 'primary:4000/lokolla/' if need_build_image else '{{ zuul_site_mirror_fqdn }}:4447/openstack.kolla/' }}"
when: scenario in ['swift']
# NOTE(yoctozepto): k-a octavia-certificates should run before k-a bootstrap-servers # NOTE(yoctozepto): k-a octavia-certificates should run before k-a bootstrap-servers
# because the latter hijacks /etc/kolla permissions (due to same directory on the # because the latter hijacks /etc/kolla permissions (due to same directory on the
@ -327,7 +328,7 @@
executable: /bin/bash executable: /bin/bash
chdir: "{{ kolla_ansible_src_dir }}" chdir: "{{ kolla_ansible_src_dir }}"
environment: environment:
KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}{{ base_distro }}-swift-base:{{ docker_image_tag }}" KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}swift-base:{{ docker_image_tag }}"
# NOTE(yoctozepto): no IPv6 for now # NOTE(yoctozepto): no IPv6 for now
STORAGE_NODES: "{{ groups['all'] | map('extract', hostvars, STORAGE_NODES: "{{ groups['all'] | map('extract', hostvars,
['ansible_'+api_interface_name, 'ipv4', 'address']) ['ansible_'+api_interface_name, 'ipv4', 'address'])

6
zuul.d/jobs.yaml
View File

@ -241,6 +241,9 @@
nodeset: kolla-ansible-rocky9-multi nodeset: kolla-ansible-rocky9-multi
vars: vars:
base_distro: rocky base_distro: rocky
# NOTE(yoctozepto): We need this here because we initialise Swift outside
# of Kolla Ansible and need to know the version of images.
base_distro_version: 9
- job: - job:
name: kolla-ansible-ubuntu-source-swift name: kolla-ansible-ubuntu-source-swift
@ -248,6 +251,9 @@
nodeset: kolla-ansible-jammy-multi nodeset: kolla-ansible-jammy-multi
vars: vars:
base_distro: ubuntu base_distro: ubuntu
# NOTE(yoctozepto): We need this here because we initialise Swift outside
# of Kolla Ansible and need to know the version of images.
base_distro_version: jammy
- job: - job:
name: kolla-ansible-rocky9-source-swift-upgrade name: kolla-ansible-rocky9-source-swift-upgrade