diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index b70b700fa..62a87615f 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -1,137 +1,273 @@ container_images: - imagename: docker.io/tripleorocky/centos-binary-aodh-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-aodh-evaluator:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-aodh-listener:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-aodh-notifier:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-barbican-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-barbican-keystone-listener:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-barbican-worker:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ceilometer-central:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ceilometer-compute:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ceilometer-notification:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ceilometer-ipmi:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-cinder-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-cinder-backup:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-cinder-scheduler:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-cinder-volume:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-collectd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-congress-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-cron:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-backend-bind9:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-base:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-central:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-mdns:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-producer:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-sink:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-designate-worker:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ec2-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-etcd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-fluentd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-glance-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-gnocchi-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-gnocchi-metricd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-gnocchi-statsd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-haproxy:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-heat-all:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-heat-api-cfn:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-heat-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-heat-engine:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-horizon:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ironic-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ironic-conductor:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ironic-inspector:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ironic-pxe:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ironic-neutron-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-iscsid:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-keepalived:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-keystone:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-manila-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-manila-base:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-manila-scheduler:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-manila-share:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-mariadb:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-memcached:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-mistral-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-mistral-engine:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-mistral-executor:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-mistral-event-engine:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-multipathd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-dhcp-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-l3-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-metadata-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-openvswitch-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-sriov-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-server:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-server-opendaylight:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-server-ovn:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-neutron-metadata-agent-ovn:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-compute-ironic:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-compute:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-conductor:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-consoleauth:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-libvirt:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-novncproxy:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-placement-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-nova-scheduler:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-novajoin-notifier:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-novajoin-server:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-octavia-base:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-octavia-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-octavia-health-manager:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-octavia-housekeeping:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-octavia-worker:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-opendaylight:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ovn-base:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ovn-controller:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ovn-nb-db-server:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ovn-northd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-ovn-sb-db-server:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-panko-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-qdrouterd:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-rabbitmq:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-redis:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-sahara-api:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-sahara-engine:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-sensu-client:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-skydive-agent:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-skydive-analyzer:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-swift-account:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-swift-container:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-swift-object:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-swift-proxy-server:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-tripleo-ui:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-zaqar:current-tripleo + image_source: kolla - imagename: docker.io/ceph/daemon:v3.2.1-stable-3.2-luminous-centos-7-x86_64 + image_source: ceph - imagename: docker.io/tripleorocky/centos-binary-tempest:current-tripleo + image_source: kolla - imagename: docker.io/tripleorocky/centos-binary-rsyslog-base:current-tripleo + image_source: kolla - imagename: docker.io/openshift/origin-ansible:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-console:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-control-plane:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-deployer:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-docker-builder:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-docker-registry:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-haproxy-router:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-node:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-pod:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-service-catalog:v3.11.0 + image_source: openshift - imagename: docker.io/openshift/origin-template-service-broker:v3.11.0 + image_source: openshift - imagename: docker.io/ansibleplaybookbundle/origin-ansible-service-broker:latest + image_source: openshift - imagename: docker.io/openshift/origin-web-console:v3.11.0 + image_source: openshift - imagename: docker.io/cockpit/kubernetes:latest + image_source: openshift - imagename: registry.fedoraproject.org/latest/etcd:latest + image_source: openshift - imagename: docker.io/gluster/gluster-centos:latest + image_source: openshift - imagename: docker.io/gluster/glusterblock-provisioner:latest + image_source: openshift - imagename: docker.io/heketi/heketi:latest + image_source: openshift - imagename: docker.io/tripleorocky/coreos-cluster-monitoring-operator:v0.1.1 + image_source: openshift - imagename: docker.io/tripleorocky/coreos-configmap-reload:v0.0.1 + image_source: openshift - imagename: docker.io/tripleorocky/coreos-prometheus-operator:v0.23.2 + image_source: openshift - imagename: docker.io/tripleorocky/coreos-prometheus-config-reloader:v0.23.2 + image_source: openshift - imagename: docker.io/openshift/prometheus:v2.3.2 + image_source: openshift - imagename: docker.io/openshift/prometheus-alertmanager:v0.15.2 + image_source: openshift - imagename: docker.io/openshift/prometheus-node-exporter:v0.16.0 + image_source: openshift - imagename: docker.io/openshift/oauth-proxy:v1.1.0 + image_source: openshift - imagename: docker.io/tripleorocky/coreos-kube-rbac-proxy:v0.3.1 + image_source: openshift - imagename: docker.io/tripleorocky/coreos-kube-state-metrics:v1.3.1 + image_source: openshift - imagename: docker.io/grafana/grafana:5.2.1 + image_source: openshift diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index d5e97c2d0..9ca098362 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -1,6 +1,7 @@ container_images_template: - imagename: "{{namespace}}/{{name_prefix}}aodh-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerAodhApiImage - DockerAodhConfigImage @@ -15,6 +16,7 @@ container_images_template: - OS::TripleO::Services::UndercloudAodhNotifier - imagename: "{{namespace}}/{{name_prefix}}aodh-evaluator{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerAodhEvaluatorImage services: @@ -22,6 +24,7 @@ container_images_template: - OS::TripleO::Services::UndercloudAodhEvaluator - imagename: "{{namespace}}/{{name_prefix}}aodh-listener{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerAodhListenerImage services: @@ -29,6 +32,7 @@ container_images_template: - OS::TripleO::Services::UndercloudAodhListener - imagename: "{{namespace}}/{{name_prefix}}aodh-notifier{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerAodhNotifierImage services: @@ -36,6 +40,7 @@ container_images_template: - OS::TripleO::Services::UndercloudAodhNotifier - imagename: "{{namespace}}/{{name_prefix}}barbican-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerBarbicanApiImage - DockerBarbicanConfigImage @@ -43,6 +48,7 @@ container_images_template: - OS::TripleO::Services::BarbicanApi - imagename: "{{namespace}}/{{name_prefix}}barbican-keystone-listener{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerBarbicanKeystoneListenerImage - DockerBarbicanKeystoneListenerConfigImage @@ -51,6 +57,7 @@ container_images_template: - OS::TripleO::Services::BarbicanKeystoneListener - imagename: "{{namespace}}/{{name_prefix}}barbican-worker{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerBarbicanWorkerImage - DockerBarbicanWorkerConfigImage @@ -59,6 +66,7 @@ container_images_template: - OS::TripleO::Services::BarbicanWorker - imagename: "{{namespace}}/{{name_prefix}}ceilometer-central{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCeilometerCentralImage - DockerCeilometerConfigImage @@ -72,12 +80,14 @@ container_images_template: - OS::TripleO::Services::UndercloudCeilometerAgentNotification - imagename: "{{namespace}}/{{name_prefix}}ceilometer-compute{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCeilometerComputeImage services: - OS::TripleO::Services::ComputeCeilometerAgent - imagename: "{{namespace}}/{{name_prefix}}ceilometer-notification{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCeilometerNotificationImage services: @@ -85,6 +95,7 @@ container_images_template: - OS::TripleO::Services::UndercloudCeilometerAgentNotification - imagename: "{{namespace}}/{{name_prefix}}ceilometer-ipmi{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCeilometerIpmiImage services: @@ -92,6 +103,7 @@ container_images_template: - OS::TripleO::Services::UndercloudCeilometerAgentIpmi - imagename: "{{namespace}}/{{name_prefix}}cinder-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCinderApiImage - DockerCinderConfigImage @@ -106,12 +118,14 @@ container_images_template: - OS::TripleO::Services::UndercloudCinderVolume - imagename: "{{namespace}}/{{name_prefix}}cinder-backup{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCinderBackupImage services: - OS::TripleO::Services::CinderBackup - imagename: "{{namespace}}/{{name_prefix}}cinder-scheduler{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCinderSchedulerImage services: @@ -119,6 +133,7 @@ container_images_template: - OS::TripleO::Services::UndercloudCinderScheduler - imagename: "{{namespace}}/{{name_prefix}}cinder-volume{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCinderVolumeImage services: @@ -127,6 +142,7 @@ container_images_template: - OS::TripleO::Services::UndercloudCinderVolume - imagename: "{{namespace}}/{{name_prefix}}collectd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCollectdConfigImage - DockerCollectdImage @@ -134,6 +150,7 @@ container_images_template: - OS::TripleO::Services::Collectd - imagename: "{{namespace}}/{{name_prefix}}congress-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCongressApiImage - DockerCongressConfigImage @@ -141,6 +158,7 @@ container_images_template: - OS::TripleO::Services::Congress - imagename: "{{namespace}}/{{name_prefix}}cron{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerCrondConfigImage - DockerCrondImage @@ -148,6 +166,7 @@ container_images_template: - OS::TripleO::Services::ContainersLogrotateCrond - imagename: "{{namespace}}/{{name_prefix}}designate-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateApiImage services: @@ -159,38 +178,45 @@ container_images_template: - OS::TripleO::Services::DesignateWorker - imagename: "{{namespace}}/{{name_prefix}}designate-backend-bind9{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateBackendBIND9Image services: - OS::TripleO::Services::DesignateWorker - imagename: "{{namespace}}/{{name_prefix}}designate-base{{name_suffix}}:{{tag}}" + image_source: kolla - imagename: "{{namespace}}/{{name_prefix}}designate-central{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateCentralImage services: - OS::TripleO::Services::DesignateCentral - imagename: "{{namespace}}/{{name_prefix}}designate-mdns{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateMDNSImage services: - OS::TripleO::Services::DesignateMDNS - imagename: "{{namespace}}/{{name_prefix}}designate-producer{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateProducerImage services: - OS::TripleO::Services::DesignateProducer - imagename: "{{namespace}}/{{name_prefix}}designate-sink{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateSinkImage services: - OS::TripleO::Services::DesignateSink - imagename: "{{namespace}}/{{name_prefix}}designate-worker{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerDesignateConfigImage - DockerDesignateWorkerImage @@ -198,6 +224,7 @@ container_images_template: - OS::TripleO::Services::DesignateWorker - imagename: "{{namespace}}/{{name_prefix}}ec2-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerEc2ApiConfigImage - DockerEc2ApiImage @@ -205,6 +232,7 @@ container_images_template: - OS::TripleO::Services::Ec2Api - imagename: "{{namespace}}/{{name_prefix}}etcd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerEtcdConfigImage - DockerEtcdImage @@ -212,6 +240,7 @@ container_images_template: - OS::TripleO::Services::Etcd - imagename: "{{namespace}}/{{name_prefix}}fluentd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerFluentdConfigImage - DockerFluentdClientImage @@ -221,6 +250,7 @@ container_images_template: - OS::TripleO::Services::Fluentd - imagename: "{{namespace}}/{{name_prefix}}glance-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerGlanceApiConfigImage - DockerGlanceApiImage @@ -228,6 +258,7 @@ container_images_template: - OS::TripleO::Services::GlanceApi - imagename: "{{namespace}}/{{name_prefix}}gnocchi-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerGnocchiApiImage - DockerGnocchiConfigImage @@ -240,6 +271,7 @@ container_images_template: - OS::TripleO::Services::UndercloudGnocchiStatsd - imagename: "{{namespace}}/{{name_prefix}}gnocchi-metricd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerGnocchiMetricdImage services: @@ -247,6 +279,7 @@ container_images_template: - OS::TripleO::Services::UndercloudGnocchiMetricd - imagename: "{{namespace}}/{{name_prefix}}gnocchi-statsd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerGnocchiStatsdImage services: @@ -254,6 +287,7 @@ container_images_template: - OS::TripleO::Services::UndercloudGnocchiStatsd - imagename: "{{namespace}}/{{name_prefix}}haproxy{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerHAProxyConfigImage - DockerHAProxyImage @@ -262,8 +296,10 @@ container_images_template: - OS::TripleO::Services::UndercloudHAProxy - imagename: "{{namespace}}/{{name_prefix}}heat-all{{name_suffix}}:{{tag}}" + image_source: kolla - imagename: "{{namespace}}/{{name_prefix}}heat-api-cfn{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerHeatApiCfnConfigImage - DockerHeatApiCfnImage @@ -271,6 +307,7 @@ container_images_template: - OS::TripleO::Services::HeatApiCfn - imagename: "{{namespace}}/{{name_prefix}}heat-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerHeatApiConfigImage - DockerHeatApiImage @@ -280,12 +317,14 @@ container_images_template: - OS::TripleO::Services::HeatEngine - imagename: "{{namespace}}/{{name_prefix}}heat-engine{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerHeatEngineImage services: - OS::TripleO::Services::HeatEngine - imagename: "{{namespace}}/{{name_prefix}}horizon{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerHorizonConfigImage - DockerHorizonImage @@ -293,6 +332,7 @@ container_images_template: - OS::TripleO::Services::Horizon - imagename: "{{namespace}}/{{name_prefix}}ironic-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerIronicApiImage - DockerIronicApiConfigImage @@ -300,12 +340,14 @@ container_images_template: - OS::TripleO::Services::IronicApi - imagename: "{{namespace}}/{{name_prefix}}ironic-conductor{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerIronicConductorImage services: - OS::TripleO::Services::IronicConductor - imagename: "{{namespace}}/{{name_prefix}}ironic-inspector{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerIronicInspectorImage - DockerIronicInspectorConfigImage @@ -313,6 +355,7 @@ container_images_template: - OS::TripleO::Services::IronicInspector - imagename: "{{namespace}}/{{name_prefix}}ironic-pxe{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerIronicConfigImage - DockerIronicPxeImage @@ -321,6 +364,7 @@ container_images_template: - OS::TripleO::Services::IronicPxe - imagename: "{{namespace}}/{{name_prefix}}ironic-neutron-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerIronicNeutronAgentImage - DockerNeutronConfigImage @@ -328,6 +372,7 @@ container_images_template: - OS::TripleO::Services::IronicNeutronAgent - imagename: "{{namespace}}/{{name_prefix}}iscsid{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerIscsidConfigImage - DockerIscsidImage @@ -335,6 +380,7 @@ container_images_template: - OS::TripleO::Services::Iscsid - imagename: "{{namespace}}/{{name_prefix}}keepalived{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerKeepalivedConfigImage - DockerKeepalivedImage @@ -343,6 +389,7 @@ container_images_template: - OS::TripleO::Services::UndercloudKeepalived - imagename: "{{namespace}}/{{name_prefix}}keystone{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerKeystoneConfigImage - DockerKeystoneImage @@ -350,6 +397,7 @@ container_images_template: - OS::TripleO::Services::Keystone - imagename: "{{namespace}}/{{name_prefix}}manila-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerManilaApiImage - DockerManilaConfigImage @@ -359,20 +407,24 @@ container_images_template: - OS::TripleO::Services::ManilaShare - imagename: "{{namespace}}/{{name_prefix}}manila-base{{name_suffix}}:{{tag}}" + image_source: kolla - imagename: "{{namespace}}/{{name_prefix}}manila-scheduler{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerManilaSchedulerImage services: - OS::TripleO::Services::ManilaScheduler - imagename: "{{namespace}}/{{name_prefix}}manila-share{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerManilaShareImage services: - OS::TripleO::Services::ManilaShare - imagename: "{{namespace}}/{{name_prefix}}mariadb{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerClustercheckConfigImage - DockerClustercheckImage @@ -383,6 +435,7 @@ container_images_template: - OS::TripleO::Services::MySQL - imagename: "{{namespace}}/{{name_prefix}}memcached{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerMemcachedConfigImage - DockerMemcachedImage @@ -390,6 +443,7 @@ container_images_template: - OS::TripleO::Services::Memcached - imagename: "{{namespace}}/{{name_prefix}}mistral-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerMistralApiImage - DockerMistralConfigImage @@ -400,24 +454,28 @@ container_images_template: - OS::TripleO::Services::MistralEventEngine - imagename: "{{namespace}}/{{name_prefix}}mistral-engine{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerMistralEngineImage services: - OS::TripleO::Services::MistralEngine - imagename: "{{namespace}}/{{name_prefix}}mistral-executor{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerMistralExecutorImage services: - OS::TripleO::Services::MistralExecutor - imagename: "{{namespace}}/{{name_prefix}}mistral-event-engine{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerMistralEventEngineImage services: - OS::TripleO::Services::MistralEventEngine - imagename: "{{namespace}}/{{name_prefix}}multipathd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerMultipathdConfigImage - DockerMultipathdImage @@ -425,24 +483,28 @@ container_images_template: - OS::TripleO::Services::Multipathd - imagename: "{{namespace}}/{{name_prefix}}neutron-dhcp-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronDHCPImage services: - OS::TripleO::Services::NeutronDhcpAgent - imagename: "{{namespace}}/{{name_prefix}}neutron-l3-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronL3AgentImage services: - OS::TripleO::Services::NeutronL3Agent - imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronMetadataImage services: - OS::TripleO::Services::NeutronMetadataAgent - imagename: "{{namespace}}/{{name_prefix}}neutron-openvswitch-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOpenvswitchImage services: @@ -450,6 +512,7 @@ container_images_template: - OS::TripleO::Services::NeutronOvsAgent - imagename: "{{namespace}}/{{name_prefix}}neutron-sriov-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronSriovImage services: @@ -457,6 +520,7 @@ container_images_template: {% if neutron_driver == "odl" %} - imagename: "{{namespace}}/{{name_prefix}}neutron-server-opendaylight{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronApiImage - DockerNeutronConfigImage @@ -469,6 +533,7 @@ container_images_template: {% elif neutron_driver == "ovn" %} - imagename: "{{namespace}}/{{name_prefix}}neutron-server-ovn{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronApiImage - DockerNeutronConfigImage @@ -477,6 +542,7 @@ container_images_template: - OS::TripleO::Services::NeutronServer - imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent-ovn{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOvnMetadataImage services: @@ -484,6 +550,7 @@ container_images_template: {% else %} - imagename: "{{namespace}}/{{name_prefix}}neutron-server{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNeutronApiImage - DockerNeutronConfigImage @@ -500,6 +567,7 @@ container_images_template: {% endif %} - imagename: "{{namespace}}/{{name_prefix}}nova-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaApiImage - DockerNovaConfigImage @@ -515,12 +583,14 @@ container_images_template: - OS::TripleO::Services::NovaMetadata - imagename: "{{namespace}}/{{name_prefix}}nova-compute-ironic{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaComputeIronicImage services: - OS::TripleO::Services::NovaIronic - imagename: "{{namespace}}/{{name_prefix}}nova-compute{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaComputeImage - DockerNovaLibvirtConfigImage @@ -530,30 +600,35 @@ container_images_template: - OS::TripleO::Services::NovaMigrationTarget - imagename: "{{namespace}}/{{name_prefix}}nova-conductor{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaConductorImage services: - OS::TripleO::Services::NovaConductor - imagename: "{{namespace}}/{{name_prefix}}nova-consoleauth{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaConsoleauthImage services: - OS::TripleO::Services::NovaConsoleauth - imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaLibvirtImage services: - OS::TripleO::Services::NovaLibvirt - imagename: "{{namespace}}/{{name_prefix}}nova-novncproxy{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaVncProxyImage services: - OS::TripleO::Services::NovaVncProxy - imagename: "{{namespace}}/{{name_prefix}}nova-placement-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaPlacementConfigImage - DockerNovaPlacementImage @@ -561,18 +636,21 @@ container_images_template: - OS::TripleO::Services::NovaPlacement - imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovaSchedulerImage services: - OS::TripleO::Services::NovaScheduler - imagename: "{{namespace}}/{{name_prefix}}novajoin-notifier{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovajoinNotifierImage services: - OS::TripleO::Services::Novajoin - imagename: "{{namespace}}/{{name_prefix}}novajoin-server{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerNovajoinServerImage - DockerNovajoinConfigImage @@ -580,8 +658,10 @@ container_images_template: - OS::TripleO::Services::Novajoin - imagename: "{{namespace}}/{{name_prefix}}octavia-base{{name_suffix}}:{{tag}}" + image_source: kolla - imagename: "{{namespace}}/{{name_prefix}}octavia-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOctaviaApiImage - DockerOctaviaConfigImage @@ -592,18 +672,21 @@ container_images_template: - OS::TripleO::Services::OctaviaWorker - imagename: "{{namespace}}/{{name_prefix}}octavia-health-manager{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOctaviaHealthManagerImage services: - OS::TripleO::Services::OctaviaHealthManager - imagename: "{{namespace}}/{{name_prefix}}octavia-housekeeping{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOctaviaHousekeepingImage services: - OS::TripleO::Services::OctaviaHousekeeping - imagename: "{{namespace}}/{{name_prefix}}octavia-worker{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOctaviaWorkerImage services: @@ -611,6 +694,7 @@ container_images_template: {% if neutron_driver == "odl" %} - imagename: "{{namespace}}/{{name_prefix}}opendaylight{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOpendaylightApiImage - DockerOpendaylightConfigImage @@ -620,8 +704,10 @@ container_images_template: {% if neutron_driver == "ovn" %} - imagename: "{{namespace}}/{{name_prefix}}ovn-base{{name_suffix}}:{{tag}}" + image_source: kolla - imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOvnControllerConfigImage - DockerOvnControllerImage @@ -629,12 +715,14 @@ container_images_template: - OS::TripleO::Services::OVNController - imagename: "{{namespace}}/{{name_prefix}}ovn-nb-db-server{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOvnNbDbImage services: - OS::TripleO::Services::OVNDBs - imagename: "{{namespace}}/{{name_prefix}}ovn-northd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOvnNorthdImage - DockerOvnDbsImage @@ -643,6 +731,7 @@ container_images_template: - OS::TripleO::Services::OVNDBs - imagename: "{{namespace}}/{{name_prefix}}ovn-sb-db-server{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerOvnSbDbImage services: @@ -650,6 +739,7 @@ container_images_template: {% endif %} - imagename: "{{namespace}}/{{name_prefix}}panko-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerPankoApiImage - DockerPankoConfigImage @@ -658,6 +748,7 @@ container_images_template: - OS::TripleO::Services::UndercloudPankoApi - imagename: "{{namespace}}/{{name_prefix}}qdrouterd{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerQdrouterdConfigImage - DockerQdrouterdImage @@ -669,6 +760,7 @@ container_images_template: - OS::TripleO::Services::MetricsQdr - imagename: "{{namespace}}/{{name_prefix}}rabbitmq{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerRabbitmqConfigImage - DockerRabbitmqImage @@ -678,6 +770,7 @@ container_images_template: - OS::TripleO::Services::OsloMessagingNotify - imagename: "{{namespace}}/{{name_prefix}}redis{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerRedisConfigImage - DockerRedisImage @@ -686,6 +779,7 @@ container_images_template: - OS::TripleO::Services::UndercloudRedis - imagename: "{{namespace}}/{{name_prefix}}sahara-api{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSaharaApiImage - DockerSaharaConfigImage @@ -694,12 +788,14 @@ container_images_template: - OS::TripleO::Services::SaharaEngine - imagename: "{{namespace}}/{{name_prefix}}sahara-engine{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSaharaEngineImage services: - OS::TripleO::Services::SaharaEngine - imagename: "{{namespace}}/{{name_prefix}}sensu-client{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSensuClientImage - DockerSensuConfigImage @@ -707,36 +803,42 @@ container_images_template: - OS::TripleO::Services::SensuClient - imagename: "{{namespace}}/{{name_prefix}}skydive-agent{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSkydiveAgentImage services: - OS::TripleO::Services::SkydiveAgent - imagename: "{{namespace}}/{{name_prefix}}skydive-analyzer{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSkydiveAnalyzerImage services: - OS::TripleO::Services::SkydiveAnalyzer - imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSwiftAccountImage services: - OS::TripleO::Services::SwiftStorage - imagename: "{{namespace}}/{{name_prefix}}swift-container{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSwiftContainerImage services: - OS::TripleO::Services::SwiftStorage - imagename: "{{namespace}}/{{name_prefix}}swift-object{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSwiftObjectImage services: - OS::TripleO::Services::SwiftStorage - imagename: "{{namespace}}/{{name_prefix}}swift-proxy-server{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerSwiftConfigImage - DockerSwiftProxyImage @@ -757,6 +859,7 @@ container_images_template: # - OS::TripleO::Services::Tacker - imagename: "{{namespace}}/{{name_prefix}}tripleo-ui{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerTripleoUIConfigImage - DockerTripleoUIImage @@ -764,6 +867,7 @@ container_images_template: - OS::TripleO::Services::TripleoUI - imagename: "{{namespace}}/{{name_prefix}}zaqar{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerZaqarConfigImage - DockerZaqarImage @@ -771,6 +875,7 @@ container_images_template: - OS::TripleO::Services::Zaqar - imagename: "{{ceph_namespace}}/{{ceph_image}}:{{ceph_tag}}" + image_source: ceph params: - DockerCephDaemonImage services: @@ -784,12 +889,14 @@ container_images_template: - OS::TripleO::Services::CephRbdMirror - imagename: "{{namespace}}/{{name_prefix}}tempest{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerTempestImage services: - OS::TripleO::Services::Tempest - imagename: "{{namespace}}/{{name_prefix}}rsyslog-base{{name_suffix}}:{{tag}}" + image_source: kolla params: - DockerRsyslogSidecarImage - DockerRsyslogSidecarConfigImage @@ -799,24 +906,28 @@ container_images_template: - OS::TripleO::Services::SwiftStorage - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-ansible:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftAnsibleImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-console:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftConsoleImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-control-plane:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftControlPlaneImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-deployer:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftDeployerImage services: @@ -825,24 +936,28 @@ container_images_template: - OS::TripleO::Services::OpenShift::Worker - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-builder:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftDockerBuilderImage services: - OS::TripleO::Services::OpenShift::Worker - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-docker-registry:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftDockerRegistryImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-haproxy-router:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftHAProxyRouterImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-node:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftNodeImage services: @@ -851,6 +966,7 @@ container_images_template: - OS::TripleO::Services::OpenShift::Worker - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-pod:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftPodImage services: @@ -859,96 +975,112 @@ container_images_template: - OS::TripleO::Services::OpenShift::Worker - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-service-catalog:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftServiceCatalogImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-template-service-broker:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftTemplateServiceBrokerImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_asb_namespace}}/{{openshift_prefix}}-ansible-service-broker:{{openshift_asb_tag}}" + image_source: openshift params: - DockerOpenShiftAnsibleServiceBrokerImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/{{openshift_prefix}}-web-console:{{openshift_tag}}" + image_source: openshift params: - DockerOpenShiftWebConsoleImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_cockpit_namespace}}/{{openshift_cockpit_image}}:{{openshift_cockpit_tag}}" + image_source: openshift params: - DockerOpenShiftCockpitImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_etcd_namespace}}/{{openshift_etcd_image}}:{{openshift_etcd_tag}}" + image_source: openshift params: - DockerOpenShiftEtcdImage services: - OS::TripleO::Services::OpenShift::Master - imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_image}}:{{openshift_gluster_tag}}" + image_source: openshift params: - DockerOpenShiftGlusterFSImage services: - OS::TripleO::Services::OpenShift::GlusterFS - imagename: "{{openshift_gluster_namespace}}/{{openshift_gluster_block_image}}:{{openshift_gluster_tag}}" + image_source: openshift params: - DockerOpenShiftGlusterFSBlockImage services: - OS::TripleO::Services::OpenShift::GlusterFS - imagename: "{{openshift_heketi_namespace}}/{{openshift_heketi_image}}:{{openshift_heketi_tag}}" + image_source: openshift params: - DockerOpenShiftGlusterFSHeketiImage services: - OS::TripleO::Services::OpenShift::GlusterFS - imagename: "{{openshift_cluster_monitoring_namespace}}/{{openshift_cluster_monitoring_image}}:{{openshift_cluster_monitoring_tag}}" + image_source: openshift params: - DockerOpenShiftClusterMonitorOperatorImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_configmap_reload_namespace}}/{{openshift_configmap_reload_image}}:{{openshift_configmap_reload_tag}}" + image_source: openshift params: - DockerOpenShiftConfigmapReloaderImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_prometheus_operator_namespace}}/{{openshift_prometheus_operator_image}}:{{openshift_prometheus_operator_tag}}" + image_source: openshift params: - DockerOpenShiftPrometheusOperatorImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_prometheus_config_reload_namespace}}/{{openshift_prometheus_config_reload_image}}:{{openshift_prometheus_config_reload_tag}}" + image_source: openshift params: - DockerOpenShiftPrometheusConfigReloaderImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/prometheus:{{openshift_prometheus_tag}}" + image_source: openshift params: - DockerOpenShiftPrometheusImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/prometheus-alertmanager:{{openshift_prometheus_alertmanager_tag}}" + image_source: openshift params: - DockerOpenShiftPrometheusAlertmanagerImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/prometheus-node-exporter:{{openshift_prometheus_node_exporter_tag}}" + image_source: openshift params: - DockerOpenShiftPrometheusNodeExporterImage services: @@ -957,12 +1089,14 @@ container_images_template: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_namespace}}/oauth-proxy:{{openshift_oauth_proxy_tag}}" + image_source: openshift params: - DockerOpenShiftOauthProxyImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_kube_rbac_proxy_namespace}}/{{openshift_kube_rbac_proxy_image}}:{{openshift_kube_rbac_proxy_tag}}" + image_source: openshift params: - DockerOpenShiftKubeRbacProxyImage services: @@ -970,12 +1104,14 @@ container_images_template: - OS::TripleO::Services::OpenShift::Worker - imagename: "{{openshift_kube_state_metrics_namespace}}/{{openshift_kube_state_metrics_image}}:{{openshift_kube_state_metrics_tag}}" + image_source: openshift params: - DockerOpenShiftKubeStateMetricsImage services: - OS::TripleO::Services::OpenShift::Infra - imagename: "{{openshift_grafana_namespace}}/grafana:{{openshift_grafana_tag}}" + image_source: openshift params: - DockerOpenShiftGrafanaImage services: diff --git a/tripleo_common/image/kolla_builder.py b/tripleo_common/image/kolla_builder.py index a87ddf71e..9cd350a7d 100644 --- a/tripleo_common/image/kolla_builder.py +++ b/tripleo_common/image/kolla_builder.py @@ -434,6 +434,9 @@ class KollaImageBuilder(base.BaseImageManager): container_images = self.load_config_files(self.CONTAINER_IMAGES) or [] container_images.sort(key=lambda i: i.get('imagename')) for i in container_images: + # Do not attempt to build containers that are not from kolla + if not i.get('image_source', '') == 'kolla': + continue image = self.imagename_to_regex(i.get('imagename')) if image: cmd.append(image) diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index 618a360bf..6edf61d4e 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -41,26 +41,40 @@ kb.init_prepare_defaults(DEFAULTS_PATH) filedata = six.u("""container_images: - imagename: docker.io/tripleorocky/heat-docker-agents-centos:latest + image_source: kolla push_destination: localhost:8787 - imagename: docker.io/tripleorocky/centos-binary-nova-compute:liberty + image_source: kolla uploader: docker push_destination: localhost:8787 - imagename: docker.io/tripleorocky/centos-binary-nova-libvirt:liberty + image_source: kolla uploader: docker - imagename: docker.io/tripleorocky/image-with-missing-tag + image_source: kolla + push_destination: localhost:8787 +- imagename: docker.io/tripleorocky/skip-build + image_source: foo push_destination: localhost:8787 """) template_filedata = six.u(""" container_images_template: - imagename: "{{namespace}}/heat-docker-agents-centos:latest" + image_source: kolla push_destination: "{{push_destination}}" - imagename: "{{namespace}}/{{name_prefix}}nova-compute{{name_suffix}}:{{tag}}" + image_source: kolla uploader: "docker" push_destination: "{{push_destination}}" - imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}" + image_source: kolla uploader: "docker" - imagename: "{{namespace}}/image-with-missing-tag" + image_source: kolla + push_destination: "{{push_destination}}" +- imagename: "{{namespace}}/skip-build" + image_source: foo push_destination: "{{push_destination}}" """) @@ -385,18 +399,25 @@ class TestKollaImageBuilderTemplate(base.TestCase): tag='liberty' ) container_images = [{ + 'image_source': 'kolla', 'imagename': 'docker.io/tripleorocky/' 'centos-binary-nova-compute:liberty', 'push_destination': 'localhost:8787', 'uploader': 'docker' }, { + 'image_source': 'kolla', 'imagename': 'docker.io/tripleorocky/' 'centos-binary-nova-libvirt:liberty', 'push_destination': 'localhost:8787', 'uploader': 'docker' }, { + 'image_source': 'kolla', 'imagename': 'docker.io/tripleorocky/image-with-missing-tag', 'push_destination': 'localhost:8787' + }, { + 'image_source': 'foo', + 'imagename': 'docker.io/tripleorocky/skip-build', + 'push_destination': 'localhost:8787' }] self.assertEqual(container_images, result) @@ -437,23 +458,32 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync(self): remove_images = [ - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-server-ovn:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-ovn-base:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-opendaylight:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-ovn-northd:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' 'controller:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' 'nb-db-server:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' 'sb-db-server:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-metadata-agent-ovn:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( remove_images=remove_images) @@ -461,21 +491,29 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync_for_odl(self): # remove neutron-server image reference from overcloud_containers.yaml remove_images = [ - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-server:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-server-ovn:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-ovn-base:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-ovn-northd:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' 'controller:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' 'nb-db-server:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary-ovn-' 'sb-db-server:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-metadata-agent-ovn:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='odl', remove_images=remove_images) @@ -483,11 +521,14 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync_for_ovn(self): # remove neutron-server image reference from overcloud_containers.yaml remove_images = [ - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-server:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-neutron-server-opendaylight:current-tripleo'}, - {'imagename': 'docker.io/tripleorocky/centos-binary' + {'image_source': 'kolla', + 'imagename': 'docker.io/tripleorocky/centos-binary' '-opendaylight:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='ovn', remove_images=remove_images) @@ -547,7 +588,8 @@ class TestPrepare(base.TestCase): def test_prepare_simple(self, mock_get): self.assertEqual({ 'container_images.yaml': [ - {'imagename': '192.0.2.0:8787/t/p-nova-compute:l'} + {'image_source': 'kolla', + 'imagename': '192.0.2.0:8787/t/p-nova-compute:l'} ], 'environments/containers-default-parameters.yaml': { 'DockerNovaComputeImage': '192.0.2.0:8787/t/p-nova-compute:l', @@ -573,7 +615,8 @@ class TestPrepare(base.TestCase): def test_prepare_includes(self, mock_get): self.assertEqual({ 'container_images.yaml': [ - {'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'} + {'image_source': 'kolla', + 'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'} ], 'environments/containers-default-parameters.yaml': { 'DockerNovaLibvirtImage': '192.0.2.0:8787/t/p-nova-libvirt:l' @@ -597,7 +640,8 @@ class TestPrepare(base.TestCase): # assert same result as includes only. includes trumps excludes self.assertEqual({ 'container_images.yaml': [ - {'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'} + {'image_source': 'kolla', + 'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'} ], 'environments/containers-default-parameters.yaml': { 'DockerNovaLibvirtImage': '192.0.2.0:8787/t/p-nova-libvirt:l' @@ -621,6 +665,7 @@ class TestPrepare(base.TestCase): def test_prepare_push_dest(self, mock_get): self.assertEqual({ 'container_images.yaml': [{ + 'image_source': 'kolla', 'imagename': 'docker.io/t/p-nova-api:l', 'push_destination': '192.0.2.0:8787', }], @@ -655,6 +700,7 @@ class TestPrepare(base.TestCase): mock_gur.return_value = '192.0.2.0:8787' self.assertEqual({ 'container_images.yaml': [{ + 'image_source': 'kolla', 'imagename': 'docker.io/t/p-nova-api:l', 'push_destination': '192.0.2.0:8787', }], @@ -687,6 +733,7 @@ class TestPrepare(base.TestCase): def test_prepare_ceph(self, mock_get): self.assertEqual({ 'container_images.yaml': [{ + 'image_source': 'ceph', 'imagename': '192.0.2.0:8787/t/ceph:l', }], 'environments/containers-default-parameters.yaml': { @@ -709,7 +756,8 @@ class TestPrepare(base.TestCase): def test_prepare_neutron_driver_default(self, mock_get): self.assertEqual({ 'container_images.yaml': [ - {'imagename': 't/p-neutron-server:l'} + {'image_source': 'kolla', + 'imagename': 't/p-neutron-server:l'} ], 'environments/containers-default-parameters.yaml': { 'DockerNeutronApiImage': 't/p-neutron-server:l', @@ -736,8 +784,10 @@ class TestPrepare(base.TestCase): def test_prepare_neutron_driver_ovn(self, mock_get): self.assertEqual({ 'container_images.yaml': [ - {'imagename': 't/p-neutron-server-ovn:l'}, - {'imagename': 't/p-ovn-controller:l'} + {'image_source': 'kolla', + 'imagename': 't/p-neutron-server-ovn:l'}, + {'image_source': 'kolla', + 'imagename': 't/p-ovn-controller:l'} ], 'environments/containers-default-parameters.yaml': { 'DockerNeutronApiImage': 't/p-neutron-server-ovn:l', @@ -767,8 +817,10 @@ class TestPrepare(base.TestCase): def test_prepare_neutron_driver_odl(self, mock_get): self.assertEqual({ 'container_images.yaml': [ - {'imagename': 't/neutron-server-opendaylight:l'}, - {'imagename': 't/opendaylight:l'} + {'image_source': 'kolla', + 'imagename': 't/neutron-server-opendaylight:l'}, + {'image_source': 'kolla', + 'imagename': 't/opendaylight:l'} ], 'environments/containers-default-parameters.yaml': { 'DockerNeutronApiImage': 't/neutron-server-opendaylight:l',