From 65e760432d9aff156b66b3d22e104053e98fa30b Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 19 Nov 2020 08:48:07 -0700 Subject: [PATCH] Switch defaults to quay.io updated for train Change-Id: Idc49a3ad3f8d52b0709abfa6b4c7eb4103f04410 (cherry picked from commit 38392c009022dc76a5ea4413c4b25da3895bd9ff) --- .../container_image_prepare_defaults.yaml | 2 +- container-images/overcloud_containers.yaml | 200 +++++++++--------- container-images/tripleo_containers.yaml | 200 +++++++++--------- tripleo_common/image/kolla_builder.py | 3 +- .../tests/image/test_kolla_builder.py | 46 ++-- 5 files changed, 226 insertions(+), 225 deletions(-) diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index c855943c8..8dc0a7194 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -13,7 +13,7 @@ parameter_defaults: # /share/tripleo-common/container-images/tripleo_containers.yaml.j2 set: # Container image name components for OpenStack images. - namespace: docker.io/tripleotrain + namespace: quay.io/tripleotrain name_prefix: centos-binary- name_suffix: '' tag: current-tripleo diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 40656db0e..a791c3096 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -1,199 +1,199 @@ container_images: -- imagename: docker.io/tripleotrain/centos-binary-aodh-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-aodh-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-aodh-evaluator:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-aodh-evaluator:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-aodh-listener:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-aodh-listener:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-aodh-notifier:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-aodh-notifier:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-barbican-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-barbican-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-barbican-keystone-listener:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-barbican-keystone-listener:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-barbican-worker:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-barbican-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ceilometer-central:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ceilometer-central:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ceilometer-compute:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ceilometer-compute:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ceilometer-notification:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ceilometer-notification:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ceilometer-ipmi:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ceilometer-ipmi:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-cinder-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-cinder-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-cinder-backup:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-cinder-backup:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-cinder-scheduler:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-cinder-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-cinder-volume:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-cinder-volume:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-collectd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-collectd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-cron:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-cron:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-backend-bind9:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-backend-bind9:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-central:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-central:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-mdns:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-mdns:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-producer:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-producer:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-sink:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-sink:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-designate-worker:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-designate-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ec2-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ec2-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-etcd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-etcd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-fluentd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-fluentd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-glance-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-glance-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-gnocchi-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-gnocchi-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-gnocchi-metricd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-gnocchi-metricd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-gnocchi-statsd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-gnocchi-statsd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-haproxy:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-haproxy:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-heat-all:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-heat-all:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-heat-api-cfn:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-heat-api-cfn:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-heat-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-heat-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-heat-engine:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-heat-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-horizon:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-horizon:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ironic-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ironic-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ironic-conductor:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ironic-conductor:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ironic-inspector:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ironic-inspector:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ironic-pxe:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ironic-pxe:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ironic-neutron-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ironic-neutron-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-iscsid:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-iscsid:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-keepalived:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-keepalived:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-keystone:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-keystone:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-manila-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-manila-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-manila-scheduler:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-manila-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-manila-share:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-manila-share:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-mariadb:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-mariadb:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-memcached:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-memcached:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-mistral-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-mistral-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-mistral-engine:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-mistral-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-mistral-executor:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-mistral-executor:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-mistral-event-engine:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-mistral-event-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-multipathd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-multipathd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-dhcp-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-dhcp-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-l3-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-l3-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-metadata-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-metadata-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-openvswitch-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-openvswitch-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-sriov-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-sriov-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-mlnx-agent:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-mlnx-agent:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-server:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-server-opendaylight:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-server-opendaylight:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-server-ovn:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-server-ovn:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-neutron-metadata-agent-ovn:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-neutron-metadata-agent-ovn:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-compute-ironic:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-compute-ironic:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-compute:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-compute:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-conductor:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-conductor:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-libvirt:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-libvirt:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-novncproxy:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-novncproxy:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-scheduler:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-nova-serialproxy:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-nova-serialproxy:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-novajoin-notifier:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-novajoin-notifier:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-novajoin-server:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-novajoin-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-octavia-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-octavia-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-octavia-health-manager:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-octavia-health-manager:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-octavia-housekeeping:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-octavia-housekeeping:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-octavia-worker:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-octavia-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-opendaylight:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-opendaylight:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ovn-controller:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ovn-controller:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ovn-nb-db-server:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ovn-nb-db-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ovn-northd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ovn-northd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-ovn-sb-db-server:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-ovn-sb-db-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-panko-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-panko-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-placement-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-placement-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-qdrouterd:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-qdrouterd:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-rabbitmq:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-rabbitmq:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-redis:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-redis:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-sahara-api:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-sahara-api:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-sahara-engine:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-sahara-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-sensu-client:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-swift-account:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-swift-account:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-swift-container:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-swift-container:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-swift-object:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-swift-object:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-swift-proxy-server:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-swift-proxy-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-tripleoclient:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-tripleoclient:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo image_source: kolla - imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph @@ -205,7 +205,7 @@ container_images: image_source: prom - imagename: quay.io/app-sre/grafana:5.2.4 image_source: grafana -- imagename: docker.io/tripleotrain/centos-binary-tempest:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo image_source: kolla -- imagename: docker.io/tripleotrain/centos-binary-rsyslog:current-tripleo +- imagename: quay.io/tripleotrain/centos-binary-rsyslog:current-tripleo image_source: kolla diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index d0608621b..ff7b0150c 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -1,204 +1,204 @@ container_images: - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-aodh-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-aodh-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-aodh-evaluator:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-aodh-evaluator:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-aodh-listener:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-aodh-listener:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-aodh-notifier:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-aodh-notifier:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-barbican-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-barbican-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-barbican-keystone-listener:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-barbican-keystone-listener:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-barbican-worker:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-barbican-worker:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ceilometer-central:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ceilometer-central:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ceilometer-compute:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ceilometer-compute:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ceilometer-ipmi:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ceilometer-ipmi:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ceilometer-notification:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ceilometer-notification:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-cinder-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-cinder-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-cinder-backup:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-cinder-backup:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-cinder-scheduler:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-cinder-scheduler:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-cinder-volume:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-cinder-volume:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-collectd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-collectd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-cron:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-cron:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-backend-bind9:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-backend-bind9:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-central:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-central:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-mdns:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-mdns:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-producer:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-producer:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-sink:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-sink:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-designate-worker:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-designate-worker:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ec2-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ec2-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-etcd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-etcd:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-fluentd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-fluentd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-glance-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-glance-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-gnocchi-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-gnocchi-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-gnocchi-metricd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-gnocchi-metricd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-gnocchi-statsd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-gnocchi-statsd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-haproxy:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-haproxy:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-heat-all:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-heat-all:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-heat-api-cfn:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-heat-api-cfn:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-heat-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-heat-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-heat-engine:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-heat-engine:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-horizon:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-horizon:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ironic-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ironic-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ironic-conductor:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ironic-conductor:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ironic-inspector:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ironic-inspector:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ironic-neutron-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ironic-neutron-agent:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ironic-pxe:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ironic-pxe:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-iscsid:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-iscsid:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-keepalived:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-keepalived:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-keystone:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-keystone:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-manila-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-manila-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-manila-scheduler:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-manila-scheduler:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-manila-share:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-manila-share:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-mariadb:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-mariadb:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-memcached:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-memcached:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-mistral-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-mistral-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-mistral-engine:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-mistral-engine:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-mistral-event-engine:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-mistral-event-engine:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-mistral-executor:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-mistral-executor:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-multipathd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-multipathd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-dhcp-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-dhcp-agent:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-l3-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-l3-agent:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-metadata-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-metadata-agent:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-mlnx-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-mlnx-agent:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-openvswitch-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-openvswitch-agent:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-neutron-server-opendaylight:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-server-opendaylight:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-metadata-agent-ovn:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-metadata-agent-ovn:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-server-ovn:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-server-ovn:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-server:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-server:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-neutron-sriov-agent:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-neutron-sriov-agent:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-compute-ironic:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-compute-ironic:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-compute:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-compute:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-conductor:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-conductor:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-libvirt:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-libvirt:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-novncproxy:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-novncproxy:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-nova-scheduler:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-scheduler:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-nova-serialproxy:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-nova-serialproxy:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-novajoin-notifier:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-novajoin-notifier:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-novajoin-server:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-novajoin-server:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-octavia-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-octavia-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-octavia-health-manager:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-octavia-health-manager:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-octavia-housekeeping:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-octavia-housekeeping:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-octavia-worker:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-octavia-worker:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-opendaylight:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-opendaylight:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ovn-controller:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ovn-controller:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ovn-nb-db-server:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ovn-nb-db-server:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ovn-northd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ovn-northd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-ovn-sb-db-server:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-ovn-sb-db-server:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-panko-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-panko-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-placement-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-placement-api:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-qdrouterd:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-qdrouterd:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-rabbitmq:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-rabbitmq:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-redis:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-redis:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-rsyslog:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-rsyslog:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-sahara-api:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-sahara-api:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-sahara-engine:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-sahara-engine:current-tripleo - image_source: kolla - imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-sensu-client:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-swift-account:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-swift-account:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-swift-container:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-swift-container:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-swift-object:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-swift-object:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-swift-proxy-server:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-swift-proxy-server:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-tempest:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-tempest:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-tripleoclient:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-tripleoclient:current-tripleo - image_source: tripleo - imagename: docker.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo + imagename: quay.io/tripleotrain/centos-binary-zaqar-wsgi:current-tripleo - imagename: quay.ceph.io/ceph-ci/daemon:v4.0.13-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph - imagename: quay.io/prometheus/prometheus:v2.7.2 diff --git a/tripleo_common/image/kolla_builder.py b/tripleo_common/image/kolla_builder.py index 3c020c7c4..b0c2678a7 100644 --- a/tripleo_common/image/kolla_builder.py +++ b/tripleo_common/image/kolla_builder.py @@ -51,7 +51,8 @@ def init_prepare_defaults(defaults_file): # Handle CentOS8 since we shipped train with py2 support, we need # to still support it while handling the namespace switch for # CentOS8 but only for the defaults - if (CONTAINER_IMAGES_DEFAULTS['namespace'] == 'docker.io/tripleotrain' + if ((CONTAINER_IMAGES_DEFAULTS['namespace'] == 'docker.io/tripleotrain' + or CONTAINER_IMAGES_DEFAULTS['namespace'] == 'quay.io/tripleotrain') and sys.version_info.major > 2): CONTAINER_IMAGES_DEFAULTS['namespace'] += 'centos8' diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index 289c21b1e..f054484c9 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -451,28 +451,28 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync(self): remove_images = [ {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server-ovn:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-opendaylight:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-ovn-northd:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' + 'imagename': 'quay.io/tripleotrain/centos-binary-ovn-' 'controller:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' + 'imagename': 'quay.io/tripleotrain/centos-binary-ovn-' 'nb-db-server:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' + 'imagename': 'quay.io/tripleotrain/centos-binary-ovn-' 'sb-db-server:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-metadata-agent-ovn:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( remove_images=remove_images) @@ -482,25 +482,25 @@ class TestKollaImageBuilderTemplate(base.TestCase): # remove neutron-server image reference from tripleo_containers.yaml remove_images = [ {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server-ovn:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-ovn-northd:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' + 'imagename': 'quay.io/tripleotrain/centos-binary-ovn-' 'controller:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' + 'imagename': 'quay.io/tripleotrain/centos-binary-ovn-' 'nb-db-server:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary-ovn-' + 'imagename': 'quay.io/tripleotrain/centos-binary-ovn-' 'sb-db-server:current-tripleo'}, {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-metadata-agent-ovn:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='odl', remove_images=remove_images) @@ -510,13 +510,13 @@ class TestKollaImageBuilderTemplate(base.TestCase): # remove neutron-server image reference from tripleo_containers.yaml remove_images = [ {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-opendaylight:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='ovn', remove_images=remove_images) @@ -525,19 +525,19 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync_for_rhel(self): remove_images = [ {'image_source': 'tripleo', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-opendaylight:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-fluentd:current-tripleo'}, {'image_source': 'kolla', - 'imagename': 'docker.io/tripleotrain/centos-binary' + 'imagename': 'quay.io/tripleotrain/centos-binary' '-sensu-client:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( rhel_containers=True, neutron_driver='ovn',