From 90f6de7a7fab15e9161c1f03acecaf98726298f1 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Thu, 20 Aug 2020 09:44:33 -0600 Subject: [PATCH] Switch default container prefix to openstack Change-Id: Ic79b8f83679679d81b17e60d28734a5b9c5fb1b2 --- .../container_image_prepare_defaults.yaml | 2 +- container-images/tripleo_containers.yaml | 216 +++++++++--------- ...-prefix-is-openstack-3cd42220d6cdfed0.yaml | 5 + 3 files changed, 114 insertions(+), 109 deletions(-) create mode 100644 releasenotes/notes/default-container-prefix-is-openstack-3cd42220d6cdfed0.yaml diff --git a/container-images/container_image_prepare_defaults.yaml b/container-images/container_image_prepare_defaults.yaml index 84e64a64a..46dc59b24 100644 --- a/container-images/container_image_prepare_defaults.yaml +++ b/container-images/container_image_prepare_defaults.yaml @@ -14,7 +14,7 @@ parameter_defaults: set: # Container image name components for OpenStack images. namespace: docker.io/tripleomaster - name_prefix: centos-binary- + name_prefix: openstack- name_suffix: '' tag: current-tripleo default_tag: True diff --git a/container-images/tripleo_containers.yaml b/container-images/tripleo_containers.yaml index ecd5c5a85..d0d8c6446 100644 --- a/container-images/tripleo_containers.yaml +++ b/container-images/tripleo_containers.yaml @@ -1,215 +1,215 @@ container_images: -- imagename: docker.io/tripleomaster/centos-binary-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-os:current-tripleo +- imagename: docker.io/tripleomaster/openstack-os:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-aodh-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-aodh-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-aodh-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-aodh-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-aodh-evaluator:current-tripleo +- imagename: docker.io/tripleomaster/openstack-aodh-evaluator:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-aodh-listener:current-tripleo +- imagename: docker.io/tripleomaster/openstack-aodh-listener:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-aodh-notifier:current-tripleo +- imagename: docker.io/tripleomaster/openstack-aodh-notifier:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-barbican-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-barbican-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-barbican-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-barbican-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-barbican-keystone-listener:current-tripleo +- imagename: docker.io/tripleomaster/openstack-barbican-keystone-listener:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-barbican-worker:current-tripleo +- imagename: docker.io/tripleomaster/openstack-barbican-worker:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ceilometer-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-central:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ceilometer-central:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-compute:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ceilometer-compute:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-notification:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ceilometer-notification:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-ipmi:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ceilometer-ipmi:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-cinder-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-cinder-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-cinder-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-cinder-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-cinder-backup:current-tripleo +- imagename: docker.io/tripleomaster/openstack-cinder-backup:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-cinder-scheduler:current-tripleo +- imagename: docker.io/tripleomaster/openstack-cinder-scheduler:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo +- imagename: docker.io/tripleomaster/openstack-cinder-volume:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-collectd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo +- imagename: docker.io/tripleomaster/openstack-cron:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-backend-bind9:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-central:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-central:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-mdns:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-mdns:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-producer:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-producer:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-sink:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-sink:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-designate-worker:current-tripleo +- imagename: docker.io/tripleomaster/openstack-designate-worker:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-etcd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-glance-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-glance-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-gnocchi-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-gnocchi-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-metricd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-gnocchi-metricd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-statsd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-gnocchi-statsd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-haproxy:current-tripleo +- imagename: docker.io/tripleomaster/openstack-haproxy:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-heat-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-heat-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-heat-all:current-tripleo +- imagename: docker.io/tripleomaster/openstack-heat-all:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-heat-api-cfn:current-tripleo +- imagename: docker.io/tripleomaster/openstack-heat-api-cfn:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-heat-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-heat-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-heat-engine:current-tripleo +- imagename: docker.io/tripleomaster/openstack-heat-engine:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-horizon:current-tripleo +- imagename: docker.io/tripleomaster/openstack-horizon:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ironic-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ironic-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ironic-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ironic-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ironic-conductor:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ironic-conductor:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ironic-inspector:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ironic-inspector:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ironic-pxe:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ironic-pxe:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ironic-neutron-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ironic-neutron-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-iscsid:current-tripleo +- imagename: docker.io/tripleomaster/openstack-iscsid:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-keepalived:current-tripleo +- imagename: docker.io/tripleomaster/openstack-keepalived:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo +- imagename: docker.io/tripleomaster/openstack-keystone:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-manila-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-manila-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-manila-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-manila-scheduler:current-tripleo +- imagename: docker.io/tripleomaster/openstack-manila-scheduler:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-manila-share:current-tripleo +- imagename: docker.io/tripleomaster/openstack-manila-share:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-mariadb:current-tripleo +- imagename: docker.io/tripleomaster/openstack-mariadb:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-memcached:current-tripleo +- imagename: docker.io/tripleomaster/openstack-memcached:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-mistral-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-mistral-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-mistral-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-mistral-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-mistral-engine:current-tripleo +- imagename: docker.io/tripleomaster/openstack-mistral-engine:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-mistral-executor:current-tripleo +- imagename: docker.io/tripleomaster/openstack-mistral-executor:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-mistral-event-engine:current-tripleo +- imagename: docker.io/tripleomaster/openstack-mistral-event-engine:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-multipathd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-multipathd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-agent-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-agent-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-dhcp-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-l3-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-l3-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-metadata-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-openvswitch-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-openvswitch-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-sriov-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-sriov-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-mlnx-agent:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-mlnx-agent:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-server:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo +- imagename: docker.io/tripleomaster/openstack-neutron-metadata-agent-ovn:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-compute-ironic:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-compute:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-conductor:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-libvirt:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-novncproxy:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo +- imagename: docker.io/tripleomaster/openstack-nova-scheduler:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-novajoin-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-novajoin-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo +- imagename: docker.io/tripleomaster/openstack-novajoin-notifier:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo +- imagename: docker.io/tripleomaster/openstack-novajoin-server:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-octavia-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-octavia-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-octavia-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-octavia-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-octavia-health-manager:current-tripleo +- imagename: docker.io/tripleomaster/openstack-octavia-health-manager:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-octavia-housekeeping:current-tripleo +- imagename: docker.io/tripleomaster/openstack-octavia-housekeeping:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo +- imagename: docker.io/tripleomaster/openstack-octavia-worker:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ovn-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ovn-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ovn-controller:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ovn-controller:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ovn-nb-db-server:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ovn-nb-db-server:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ovn-northd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ovn-northd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo +- imagename: docker.io/tripleomaster/openstack-ovn-sb-db-server:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-placement-api:current-tripleo +- imagename: docker.io/tripleomaster/openstack-placement-api:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-qdrouterd:current-tripleo +- imagename: docker.io/tripleomaster/openstack-qdrouterd:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-rabbitmq:current-tripleo +- imagename: docker.io/tripleomaster/openstack-rabbitmq:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-redis:current-tripleo +- imagename: docker.io/tripleomaster/openstack-redis:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-swift-base:current-tripleo +- imagename: docker.io/tripleomaster/openstack-swift-base:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo +- imagename: docker.io/tripleomaster/openstack-swift-account:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo +- imagename: docker.io/tripleomaster/openstack-swift-container:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo +- imagename: docker.io/tripleomaster/openstack-swift-object:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo +- imagename: docker.io/tripleomaster/openstack-swift-proxy-server:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo +- imagename: docker.io/tripleomaster/openstack-zaqar-wsgi:current-tripleo image_source: tripleo - imagename: docker.io/ceph/daemon:v4.0.12-stable-4.0-nautilus-centos-7-x86_64 image_source: ceph @@ -221,7 +221,7 @@ container_images: image_source: prom - imagename: docker.io/grafana/grafana:5.4.3 image_source: grafana -- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo +- imagename: docker.io/tripleomaster/openstack-tempest:current-tripleo image_source: tripleo -- imagename: docker.io/tripleomaster/centos-binary-rsyslog:current-tripleo +- imagename: docker.io/tripleomaster/openstack-rsyslog:current-tripleo image_source: tripleo diff --git a/releasenotes/notes/default-container-prefix-is-openstack-3cd42220d6cdfed0.yaml b/releasenotes/notes/default-container-prefix-is-openstack-3cd42220d6cdfed0.yaml new file mode 100644 index 000000000..b1f2665a6 --- /dev/null +++ b/releasenotes/notes/default-container-prefix-is-openstack-3cd42220d6cdfed0.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The default container prefix is `openstack-` instead of `centos-binary-` + starting with Victoria.