CI: switch to quay.io for container images
Based on the discussions from recent Kolla meetings [1][2][3], we established that, to avoid the DockerHub pull limit issues in our CI, we will try using quay.io. The images have already been published via Kolla CI for master/Wallaby [4] and Victoria [5]. This change applies only to CI. The user-facing move is yet to be discussed. [1] http://eavesdrop.openstack.org/meetings/kolla/2021/kolla.2021-03-17-15.00.log.html#l-102 [2] http://eavesdrop.openstack.org/meetings/kolla/2021/kolla.2021-03-24-15.00.log.html#l-137 [3] http://eavesdrop.openstack.org/meetings/kolla/2021/kolla.2021-03-31-15.01.log.html#l-50 [4] https://review.opendev.org/c/openstack/kolla/+/781130 [5] https://review.opendev.org/c/openstack/kolla/+/781899 See related Kolla Ansible change I22e11a994801447526ac26fc2815a1679876225e Change-Id: Id6690dc9a486af0ed7d42555d84cf77d6de0b6af
This commit is contained in:
parent
4dba1f3ee1
commit
4ad010a5a6
@ -1,4 +1,7 @@
|
||||
---
|
||||
# Use HTTPS opendev quay.io registry proxy.
|
||||
docker_registry_insecure: no
|
||||
|
||||
# Most development environments will use nested virtualisation, and we can't
|
||||
# guarantee that nested KVM support is available. Use QEMU as a lowest common
|
||||
# denominator.
|
||||
@ -7,6 +10,7 @@ nova_compute_virt_type: qemu
|
||||
# Reduce the control plane's memory footprint by limiting the number of worker
|
||||
# processes to one per-service.
|
||||
openstack_service_workers: "1"
|
||||
openstack_service_rpc_workers: "1"
|
||||
|
||||
{% if tls_enabled %}
|
||||
# TLS
|
||||
|
@ -15,6 +15,9 @@ docker_registry_mirrors:
|
||||
|
||||
kolla_base_distro: "{{ ansible_distribution | lower }}"
|
||||
kolla_install_type: "{{ 'source' if ansible_distribution == 'Ubuntu' else 'binary' }}"
|
||||
kolla_docker_namespace: "openstack.kolla"
|
||||
# use the published images from a site mirror of quay.io
|
||||
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
|
||||
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
|
||||
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
|
||||
kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
|
||||
|
@ -24,7 +24,6 @@
|
||||
template:
|
||||
src: globals.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||
when: tls_enabled
|
||||
|
||||
- name: Ensure kayobe is installed
|
||||
shell:
|
||||
|
16
playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2
Normal file
16
playbooks/kayobe-overcloud-upgrade-base/globals.yml.j2
Normal file
@ -0,0 +1,16 @@
|
||||
---
|
||||
# Use HTTPS opendev quay.io registry proxy.
|
||||
docker_registry_insecure: no
|
||||
|
||||
# Most development environments will use nested virtualisation, and we can't
|
||||
# guarantee that nested KVM support is available. Use QEMU as a lowest common
|
||||
# denominator.
|
||||
nova_compute_virt_type: qemu
|
||||
|
||||
# Reduce the control plane's memory footprint by limiting the number of worker
|
||||
# processes to one per-service.
|
||||
openstack_service_workers: "1"
|
||||
openstack_service_rpc_workers: "1"
|
||||
|
||||
# TODO(priteau): Remove me once binary images with wallaby packages are available
|
||||
nova_install_type: "source"
|
@ -7,6 +7,9 @@ disable_selinux_do_reboot: false
|
||||
docker_registry_mirrors:
|
||||
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
|
||||
|
||||
kolla_docker_namespace: "openstack.kolla"
|
||||
# use the published images from a site mirror of quay.io
|
||||
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
|
||||
{% if not is_previous_release | default(false) %}
|
||||
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
|
||||
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
|
||||
|
@ -19,3 +19,8 @@
|
||||
dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml"
|
||||
vars:
|
||||
is_previous_release: true
|
||||
|
||||
- name: Ensure kolla-ansible globals.yml override config file exists
|
||||
template:
|
||||
src: globals.yml.j2
|
||||
dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||
|
@ -50,6 +50,11 @@
|
||||
src: overrides.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml"
|
||||
|
||||
- name: Ensure kolla-ansible globals.yml override config file exists
|
||||
template:
|
||||
src: globals.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||
|
||||
# Perform a smoke test against the previous release.
|
||||
|
||||
- block:
|
||||
|
3
playbooks/kayobe-seed-base/globals.yml.j2
Normal file
3
playbooks/kayobe-seed-base/globals.yml.j2
Normal file
@ -0,0 +1,3 @@
|
||||
---
|
||||
# Use HTTPS opendev quay.io registry proxy.
|
||||
docker_registry_insecure: no
|
@ -7,6 +7,9 @@ disable_selinux_do_reboot: false
|
||||
docker_registry_mirrors:
|
||||
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
|
||||
|
||||
kolla_docker_namespace: "openstack.kolla"
|
||||
# use the published images from a site mirror of quay.io
|
||||
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
|
||||
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
|
||||
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
|
||||
kolla_ansible_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla-ansible'].src_dir }}"
|
||||
|
@ -20,6 +20,11 @@
|
||||
src: overrides.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml"
|
||||
|
||||
- name: Ensure kolla-ansible globals.yml override config file exists
|
||||
template:
|
||||
src: globals.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||
|
||||
- name: Ensure bifrost overrides directory exists
|
||||
file:
|
||||
path: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
|
||||
|
3
playbooks/kayobe-seed-upgrade-base/globals.yml.j2
Normal file
3
playbooks/kayobe-seed-upgrade-base/globals.yml.j2
Normal file
@ -0,0 +1,3 @@
|
||||
---
|
||||
# Use HTTPS opendev quay.io registry proxy.
|
||||
docker_registry_insecure: no
|
@ -7,6 +7,9 @@ disable_selinux_do_reboot: false
|
||||
docker_registry_mirrors:
|
||||
- "http://{{ zuul_site_mirror_fqdn }}:8082/"
|
||||
|
||||
kolla_docker_namespace: "openstack.kolla"
|
||||
# use the published images from a site mirror of quay.io
|
||||
kolla_docker_registry: "{{ zuul_site_mirror_fqdn }}:4447"
|
||||
{% if not is_previous_release | default(false) %}
|
||||
kolla_source_url: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kolla'].src_dir }}"
|
||||
kolla_source_version: "{{ zuul.projects['opendev.org/openstack/kolla'].checkout }}"
|
||||
|
@ -20,6 +20,11 @@
|
||||
vars:
|
||||
is_previous_release: true
|
||||
|
||||
- name: Ensure kolla-ansible globals.yml override config file exists
|
||||
template:
|
||||
src: globals.yml.j2
|
||||
dest: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||
|
||||
- name: Ensure bifrost overrides directory exists
|
||||
file:
|
||||
path: "{{ previous_kayobe_config_src_dir }}/etc/kayobe/kolla/config/bifrost"
|
||||
|
@ -43,6 +43,11 @@
|
||||
src: overrides.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zz-overrides.yml"
|
||||
|
||||
- name: Ensure kolla-ansible globals.yml override config file exists
|
||||
template:
|
||||
src: globals.yml.j2
|
||||
dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
|
||||
|
||||
# TODO(mgoddard): Perform a smoke test against the previous release.
|
||||
|
||||
- block:
|
||||
|
Loading…
Reference in New Issue
Block a user