From 9df155a342105983053cd118efc3f159c54afcf6 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Wed, 19 Aug 2020 12:28:05 -0600 Subject: [PATCH] Remove overcloud_containers.yaml Since we've switched to tcib, use tripleo_containers.yaml instead as necessary. Change-Id: I3f2bca02fdd8761bcd9ecaf58e6508b179ef0777 --- container-images/overcloud_containers.yaml | 193 ---- container-images/overcloud_containers.yaml.j2 | 919 ------------------ contrib/overcloud_containers.yaml | 1 - 3 files changed, 1113 deletions(-) delete mode 100644 container-images/overcloud_containers.yaml delete mode 100644 container-images/overcloud_containers.yaml.j2 delete mode 120000 contrib/overcloud_containers.yaml diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml deleted file mode 100644 index 79140fc18..000000000 --- a/container-images/overcloud_containers.yaml +++ /dev/null @@ -1,193 +0,0 @@ -container_images: -- imagename: docker.io/tripleomaster/centos-binary-aodh-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-aodh-evaluator:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-aodh-listener:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-aodh-notifier:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-barbican-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-barbican-keystone-listener:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-barbican-worker:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-central:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-compute:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-notification:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ceilometer-ipmi:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-backup:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-scheduler:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-central:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-mdns:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-producer:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-sink:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-designate-worker:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-glance-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-metricd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-gnocchi-statsd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-haproxy:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-all:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-api-cfn:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-heat-engine:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-horizon:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-conductor:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-inspector:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-pxe:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ironic-neutron-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-iscsid:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-keepalived:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-manila-scheduler:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-manila-share:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mariadb:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-memcached:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-engine:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-executor:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-mistral-event-engine:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-multipathd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-l3-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-openvswitch-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-sriov-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-mlnx-agent:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-health-manager:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-housekeeping:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-controller:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-nb-db-server:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-northd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-placement-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-qdrouterd:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-rabbitmq:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-redis:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-sahara-api:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo - image_source: kolla -- imagename: docker.io/ceph/daemon:v4.0.12-stable-4.0-nautilus-centos-7-x86_64 - image_source: ceph -- imagename: docker.io/prom/prometheus:v2.7.2 - image_source: prom -- imagename: docker.io/prom/alertmanager:v0.16.2 - image_source: prom -- imagename: docker.io/prom/node-exporter:v0.17.0 - image_source: prom -- imagename: docker.io/grafana/grafana:5.4.3 - image_source: grafana -- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo - image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-rsyslog:current-tripleo - image_source: kolla diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 deleted file mode 100644 index f5128d8b9..000000000 --- a/container-images/overcloud_containers.yaml.j2 +++ /dev/null @@ -1,919 +0,0 @@ -container_images_template: - -- imagename: "{{namespace}}/{{name_prefix}}aodh-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerAodhApiImage - - ContainerAodhConfigImage - services: - - OS::TripleO::Services::AodhApi - - OS::TripleO::Services::AodhEvaluator - - OS::TripleO::Services::AodhListener - - OS::TripleO::Services::AodhNotifier - - OS::TripleO::Services::UndercloudAodhApi - - OS::TripleO::Services::UndercloudAodhEvaluator - - OS::TripleO::Services::UndercloudAodhListener - - OS::TripleO::Services::UndercloudAodhNotifier - -- imagename: "{{namespace}}/{{name_prefix}}aodh-evaluator{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerAodhEvaluatorImage - services: - - OS::TripleO::Services::AodhEvaluator - - OS::TripleO::Services::UndercloudAodhEvaluator - -- imagename: "{{namespace}}/{{name_prefix}}aodh-listener{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerAodhListenerImage - services: - - OS::TripleO::Services::AodhListener - - OS::TripleO::Services::UndercloudAodhListener - -- imagename: "{{namespace}}/{{name_prefix}}aodh-notifier{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerAodhNotifierImage - services: - - OS::TripleO::Services::AodhNotifier - - OS::TripleO::Services::UndercloudAodhNotifier - -- imagename: "{{namespace}}/{{name_prefix}}barbican-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerBarbicanApiImage - - ContainerBarbicanConfigImage - services: - - OS::TripleO::Services::BarbicanApi - -- imagename: "{{namespace}}/{{name_prefix}}barbican-keystone-listener{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerBarbicanKeystoneListenerImage - - ContainerBarbicanKeystoneListenerConfigImage - services: - - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::BarbicanKeystoneListener - -- imagename: "{{namespace}}/{{name_prefix}}barbican-worker{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerBarbicanWorkerImage - - ContainerBarbicanWorkerConfigImage - services: - - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::BarbicanWorker - -- imagename: "{{namespace}}/{{name_prefix}}ceilometer-central{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCeilometerCentralImage - - ContainerCeilometerConfigImage - services: - - OS::TripleO::Services::CeilometerAgentCentral - - OS::TripleO::Services::CeilometerAgentIpmi - - OS::TripleO::Services::CeilometerAgentNotification - - OS::TripleO::Services::ComputeCeilometerAgent - - OS::TripleO::Services::UndercloudCeilometerAgentCentral - - OS::TripleO::Services::UndercloudCeilometerAgentIpmi - - OS::TripleO::Services::UndercloudCeilometerAgentNotification - -- imagename: "{{namespace}}/{{name_prefix}}ceilometer-compute{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCeilometerComputeImage - services: - - OS::TripleO::Services::ComputeCeilometerAgent - -- imagename: "{{namespace}}/{{name_prefix}}ceilometer-notification{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCeilometerNotificationImage - services: - - OS::TripleO::Services::CeilometerAgentNotification - - OS::TripleO::Services::UndercloudCeilometerAgentNotification - -- imagename: "{{namespace}}/{{name_prefix}}ceilometer-ipmi{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCeilometerIpmiImage - services: - - OS::TripleO::Services::CeilometerAgentIpmi - - OS::TripleO::Services::UndercloudCeilometerAgentIpmi - -- imagename: "{{namespace}}/{{name_prefix}}cinder-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCinderApiImage - - ContainerCinderConfigImage - services: - - OS::TripleO::Services::BlockStorageCinderVolume - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::CinderBackup - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::CinderVolume - - OS::TripleO::Services::UndercloudCinderApi - - OS::TripleO::Services::UndercloudCinderScheduler - - OS::TripleO::Services::UndercloudCinderVolume - -- imagename: "{{namespace}}/{{name_prefix}}cinder-backup{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCinderBackupImage - services: - - OS::TripleO::Services::CinderBackup - -- imagename: "{{namespace}}/{{name_prefix}}cinder-scheduler{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCinderSchedulerImage - services: - - OS::TripleO::Services::CinderScheduler - - OS::TripleO::Services::UndercloudCinderScheduler - -- imagename: "{{namespace}}/{{name_prefix}}cinder-volume{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCinderVolumeImage - services: - - OS::TripleO::Services::BlockStorageCinderVolume - - OS::TripleO::Services::CinderVolume - - OS::TripleO::Services::UndercloudCinderVolume - -- imagename: "{{namespace}}/{{name_prefix}}collectd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCollectdConfigImage - - ContainerCollectdImage - services: - - OS::TripleO::Services::Collectd - -- imagename: "{{namespace}}/{{name_prefix}}cron{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerCrondConfigImage - - ContainerCrondImage - services: - - OS::TripleO::Services::ContainersLogrotateCrond - -- imagename: "{{namespace}}/{{name_prefix}}designate-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateApiImage - services: - - OS::TripleO::Services::DesignateApi - - OS::TripleO::Services::DesignateCentral - - OS::TripleO::Services::DesignateMDNS - - OS::TripleO::Services::DesignateSink - - OS::TripleO::Services::DesignateProducer - - OS::TripleO::Services::DesignateWorker - -- imagename: "{{namespace}}/{{name_prefix}}designate-backend-bind9{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateBackendBIND9Image - services: - - OS::TripleO::Services::DesignateWorker - -- imagename: "{{namespace}}/{{name_prefix}}designate-central{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateCentralImage - services: - - OS::TripleO::Services::DesignateCentral - -- imagename: "{{namespace}}/{{name_prefix}}designate-mdns{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateMDNSImage - services: - - OS::TripleO::Services::DesignateMDNS - -- imagename: "{{namespace}}/{{name_prefix}}designate-producer{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateProducerImage - services: - - OS::TripleO::Services::DesignateProducer - -- imagename: "{{namespace}}/{{name_prefix}}designate-sink{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateSinkImage - services: - - OS::TripleO::Services::DesignateSink - -- imagename: "{{namespace}}/{{name_prefix}}designate-worker{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerDesignateConfigImage - - ContainerDesignateWorkerImage - services: - - OS::TripleO::Services::DesignateWorker - -- imagename: "{{namespace}}/{{name_prefix}}etcd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerEtcdConfigImage - - ContainerEtcdImage - services: - - OS::TripleO::Services::Etcd - -- imagename: "{{namespace}}/{{name_prefix}}glance-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerGlanceApiConfigImage - - ContainerGlanceApiImage - services: - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::GlanceApiEdge - -- imagename: "{{namespace}}/{{name_prefix}}gnocchi-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerGnocchiApiImage - - ContainerGnocchiConfigImage - services: - - OS::TripleO::Services::GnocchiApi - - OS::TripleO::Services::GnocchiMetricd - - OS::TripleO::Services::GnocchiStatsd - - OS::TripleO::Services::UndercloudGnocchiApi - - OS::TripleO::Services::UndercloudGnocchiMetricd - - OS::TripleO::Services::UndercloudGnocchiStatsd - -- imagename: "{{namespace}}/{{name_prefix}}gnocchi-metricd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerGnocchiMetricdImage - services: - - OS::TripleO::Services::GnocchiMetricd - - OS::TripleO::Services::UndercloudGnocchiMetricd - -- imagename: "{{namespace}}/{{name_prefix}}gnocchi-statsd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerGnocchiStatsdImage - services: - - OS::TripleO::Services::GnocchiStatsd - - OS::TripleO::Services::UndercloudGnocchiStatsd - -- imagename: "{{namespace}}/{{name_prefix}}haproxy{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerHAProxyConfigImage - - ContainerHAProxyImage - services: - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::HAproxyEdge - - 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: - - ContainerHeatApiCfnConfigImage - - ContainerHeatApiCfnImage - services: - - OS::TripleO::Services::HeatApiCfn - -- imagename: "{{namespace}}/{{name_prefix}}heat-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerHeatApiConfigImage - - ContainerHeatApiImage - - ContainerHeatConfigImage - services: - - OS::TripleO::Services::HeatApi - - OS::TripleO::Services::HeatEngine - -- imagename: "{{namespace}}/{{name_prefix}}heat-engine{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerHeatEngineImage - services: - - OS::TripleO::Services::HeatEngine - -- imagename: "{{namespace}}/{{name_prefix}}horizon{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerHorizonConfigImage - - ContainerHorizonImage - services: - - OS::TripleO::Services::Horizon - -- imagename: "{{namespace}}/{{name_prefix}}ironic-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerIronicApiImage - - ContainerIronicApiConfigImage - services: - - OS::TripleO::Services::IronicApi - -- imagename: "{{namespace}}/{{name_prefix}}ironic-conductor{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerIronicConductorImage - services: - - OS::TripleO::Services::IronicConductor - -- imagename: "{{namespace}}/{{name_prefix}}ironic-inspector{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerIronicInspectorImage - - ContainerIronicInspectorConfigImage - services: - - OS::TripleO::Services::IronicInspector - -- imagename: "{{namespace}}/{{name_prefix}}ironic-pxe{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerIronicConfigImage - - ContainerIronicPxeImage - services: - - OS::TripleO::Services::IronicConductor - - OS::TripleO::Services::IronicPxe - -- imagename: "{{namespace}}/{{name_prefix}}ironic-neutron-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerIronicNeutronAgentImage - - ContainerNeutronConfigImage - services: - - OS::TripleO::Services::IronicNeutronAgent - -- imagename: "{{namespace}}/{{name_prefix}}iscsid{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerIscsidConfigImage - - ContainerIscsidImage - services: - - OS::TripleO::Services::Iscsid - -- imagename: "{{namespace}}/{{name_prefix}}keepalived{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerKeepalivedConfigImage - - ContainerKeepalivedImage - services: - - OS::TripleO::Services::Keepalived - - OS::TripleO::Services::UndercloudKeepalived - -- imagename: "{{namespace}}/{{name_prefix}}keystone{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerKeystoneConfigImage - - ContainerKeystoneImage - services: - - OS::TripleO::Services::Keystone - -- imagename: "{{namespace}}/{{name_prefix}}manila-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerManilaApiImage - - ContainerManilaConfigImage - services: - - OS::TripleO::Services::ManilaApi - - OS::TripleO::Services::ManilaScheduler - - OS::TripleO::Services::ManilaShare - -- imagename: "{{namespace}}/{{name_prefix}}manila-scheduler{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerManilaSchedulerImage - services: - - OS::TripleO::Services::ManilaScheduler - -- imagename: "{{namespace}}/{{name_prefix}}manila-share{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerManilaShareImage - services: - - OS::TripleO::Services::ManilaShare - -- imagename: "{{namespace}}/{{name_prefix}}mariadb{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerClustercheckConfigImage - - ContainerClustercheckImage - - ContainerMysqlConfigImage - - ContainerMysqlImage - - ContainerMysqlClientConfigImage - services: - - OS::TripleO::Services::MySQL - -- imagename: "{{namespace}}/{{name_prefix}}memcached{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerMemcachedConfigImage - - ContainerMemcachedImage - services: - - OS::TripleO::Services::Memcached - -- imagename: "{{namespace}}/{{name_prefix}}mistral-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerMistralApiImage - - ContainerMistralConfigImage - services: - - OS::TripleO::Services::MistralApi - - OS::TripleO::Services::MistralEngine - - OS::TripleO::Services::MistralExecutor - - OS::TripleO::Services::MistralEventEngine - -- imagename: "{{namespace}}/{{name_prefix}}mistral-engine{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerMistralEngineImage - services: - - OS::TripleO::Services::MistralEngine - -- imagename: "{{namespace}}/{{name_prefix}}mistral-executor{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerMistralExecutorImage - services: - - OS::TripleO::Services::MistralExecutor - -- imagename: "{{namespace}}/{{name_prefix}}mistral-event-engine{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerMistralEventEngineImage - services: - - OS::TripleO::Services::MistralEventEngine - -- imagename: "{{namespace}}/{{name_prefix}}multipathd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerMultipathdConfigImage - - ContainerMultipathdImage - services: - - OS::TripleO::Services::Multipathd - -- imagename: "{{namespace}}/{{name_prefix}}neutron-dhcp-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronDHCPImage - services: - - OS::TripleO::Services::NeutronDhcpAgent - -- imagename: "{{namespace}}/{{name_prefix}}neutron-l3-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronL3AgentImage - services: - - OS::TripleO::Services::NeutronL3Agent - -- imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronMetadataImage - services: - - OS::TripleO::Services::NeutronMetadataAgent - -- imagename: "{{namespace}}/{{name_prefix}}neutron-openvswitch-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOpenvswitchImage - services: - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::NeutronOvsAgent - -- imagename: "{{namespace}}/{{name_prefix}}neutron-sriov-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronSriovImage - services: - - OS::TripleO::Services::NeutronSriovAgent - -- imagename: "{{namespace}}/{{name_prefix}}neutron-mlnx-agent{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronMlnxImage - services: - - OS::TripleO::Services::NeutronMlnxAgent - -- imagename: "{{namespace}}/{{name_prefix}}neutron-server{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronApiImage - - ContainerNeutronConfigImage - services: - - OS::TripleO::Services::ComputeNeutronOvsAgent - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronCorePlugin - - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronL3Agent - - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronOvsAgent - - OS::TripleO::Services::NeutronServer - - OS::TripleO::Services::NeutronSriovAgent -{% if neutron_driver == "ovn" %} - - OS::TripleO::Services::OVNController - -- imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent-ovn{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOvnMetadataImage - services: - - OS::TripleO::Services::OVNMetadataAgent -{% endif %} - -- imagename: "{{namespace}}/{{name_prefix}}nova-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaApiImage - - ContainerNovaConfigImage - - ContainerNovaMetadataImage - - ContainerNovaMetadataConfigImage - services: - - OS::TripleO::Services::NovaApi - - OS::TripleO::Services::NovaConductor - - OS::TripleO::Services::NovaIronic - - OS::TripleO::Services::NovaScheduler - - OS::TripleO::Services::NovaVncProxy - - OS::TripleO::Services::NovaMetadata - -- imagename: "{{namespace}}/{{name_prefix}}nova-compute-ironic{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaComputeIronicImage - services: - - OS::TripleO::Services::NovaIronic - -- imagename: "{{namespace}}/{{name_prefix}}nova-compute{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaComputeImage - - ContainerNovaLibvirtConfigImage - services: - - OS::TripleO::Services::NovaCompute - - OS::TripleO::Services::NovaLibvirt - - OS::TripleO::Services::NovaMigrationTarget - -- imagename: "{{namespace}}/{{name_prefix}}nova-conductor{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaConductorImage - services: - - OS::TripleO::Services::NovaConductor - -- imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaLibvirtImage - services: - - OS::TripleO::Services::NovaLibvirt - -- imagename: "{{namespace}}/{{name_prefix}}nova-novncproxy{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaVncProxyImage - services: - - OS::TripleO::Services::NovaVncProxy - -- imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaSchedulerImage - services: - - OS::TripleO::Services::NovaScheduler - -- imagename: "{{namespace}}/{{name_prefix}}novajoin-notifier{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovajoinNotifierImage - services: - - OS::TripleO::Services::Novajoin - -- imagename: "{{namespace}}/{{name_prefix}}novajoin-server{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovajoinServerImage - - ContainerNovajoinConfigImage - services: - - OS::TripleO::Services::Novajoin - -- imagename: "{{namespace}}/{{name_prefix}}octavia-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOctaviaApiImage - - ContainerOctaviaConfigImage - - ContainerOctaviaDriverAgentImage - - ContainerOctaviaDriverAgentConfigImage - services: - - OS::TripleO::Services::OctaviaApi - - OS::TripleO::Services::OctaviaHealthManager - - OS::TripleO::Services::OctaviaHousekeeping - - OS::TripleO::Services::OctaviaWorker - -- imagename: "{{namespace}}/{{name_prefix}}octavia-health-manager{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOctaviaHealthManagerImage - services: - - OS::TripleO::Services::OctaviaHealthManager - -- imagename: "{{namespace}}/{{name_prefix}}octavia-housekeeping{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOctaviaHousekeepingImage - services: - - OS::TripleO::Services::OctaviaHousekeeping - -- imagename: "{{namespace}}/{{name_prefix}}octavia-worker{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOctaviaWorkerImage - services: - - OS::TripleO::Services::OctaviaWorker - -{% if neutron_driver == "ovn" %} -- imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOvnControllerConfigImage - - ContainerOvnControllerImage - services: - - OS::TripleO::Services::OVNController - -- imagename: "{{namespace}}/{{name_prefix}}ovn-nb-db-server{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOvnNbDbImage - services: - - OS::TripleO::Services::OVNDBs - -- imagename: "{{namespace}}/{{name_prefix}}ovn-northd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOvnNorthdImage - - ContainerOvnDbsImage - - ContainerOvnDbsConfigImage - services: - - OS::TripleO::Services::OVNDBs - -- imagename: "{{namespace}}/{{name_prefix}}ovn-sb-db-server{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOvnSbDbImage - services: - - OS::TripleO::Services::OVNDBs -{% endif %} - -- imagename: "{{namespace}}/{{name_prefix}}placement-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerPlacementConfigImage - - ContainerPlacementImage - services: - - OS::TripleO::Services::PlacementApi - -- imagename: "{{namespace}}/{{name_prefix}}qdrouterd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerQdrouterdConfigImage - - ContainerQdrouterdImage - - ContainerMetricsQdrConfigImage - - ContainerMetricsQdrImage - services: - - OS::TripleO::Services::Qdr - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::MetricsQdr - -- imagename: "{{namespace}}/{{name_prefix}}rabbitmq{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerRabbitmqConfigImage - - ContainerRabbitmqImage - services: - - OS::TripleO::Services::RabbitMQ - - OS::TripleO::Services::OsloMessagingRpc - - OS::TripleO::Services::OsloMessagingNotify - -- imagename: "{{namespace}}/{{name_prefix}}redis{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerRedisConfigImage - - ContainerRedisImage - services: - - OS::TripleO::Services::Redis - - OS::TripleO::Services::UndercloudRedis - -- imagename: "{{namespace}}/{{name_prefix}}sahara-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSaharaApiImage - - ContainerSaharaConfigImage - services: - - OS::TripleO::Services::SaharaApi - - OS::TripleO::Services::SaharaEngine - -- imagename: "{{namespace}}/{{name_prefix}}sahara-engine{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSaharaEngineImage - services: - - OS::TripleO::Services::SaharaEngine - -- imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSwiftAccountImage - services: - - OS::TripleO::Services::SwiftStorage - -- imagename: "{{namespace}}/{{name_prefix}}swift-container{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSwiftContainerImage - services: - - OS::TripleO::Services::SwiftStorage - -- imagename: "{{namespace}}/{{name_prefix}}swift-object{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSwiftObjectImage - services: - - OS::TripleO::Services::SwiftStorage - -- imagename: "{{namespace}}/{{name_prefix}}swift-proxy-server{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSwiftConfigImage - - ContainerSwiftProxyImage - services: - - OS::TripleO::Services::SwiftProxy - - OS::TripleO::Services::SwiftRingBuilder - - OS::TripleO::Services::SwiftStorage - -- imagename: "{{namespace}}/{{name_prefix}}zaqar-wsgi{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerZaqarConfigImage - - ContainerZaqarImage - services: - - OS::TripleO::Services::Zaqar - -- imagename: "{{ceph_namespace}}/{{ceph_image}}:{{ceph_tag}}" - image_source: ceph - params: - - ContainerCephDaemonImage - services: - - OS::TripleO::Services::CephClient - - OS::TripleO::Services::CephExternal - - OS::TripleO::Services::CephMds - - OS::TripleO::Services::CephMgr - - OS::TripleO::Services::CephMon - - OS::TripleO::Services::CephOSD - - OS::TripleO::Services::CephRgw - - OS::TripleO::Services::CephRbdMirror - -- imagename: "{{ceph_prometheus_namespace}}/{{ceph_prometheus_image}}:{{ceph_prometheus_tag}}" - image_source: prom - params: - - PrometheusContainerImage - services: - - OS::TripleO::Services::CephGrafana - -- imagename: "{{ceph_alertmanager_namespace}}/{{ceph_alertmanager_image}}:{{ceph_alertmanager_tag}}" - image_source: prom - params: - - AlertManagerContainerImage - services: - - OS::TripleO::Services::CephGrafana - -- imagename: "{{ceph_node_exporter_namespace}}/{{ceph_node_exporter_image}}:{{ceph_node_exporter_tag}}" - image_source: prom - params: - - NodeExporterContainerImage - services: - - OS::TripleO::Services::CephGrafana - -- imagename: "{{ceph_grafana_namespace}}/{{ceph_grafana_image}}:{{ceph_grafana_tag}}" - image_source: grafana - params: - - GrafanaContainerImage - services: - - OS::TripleO::Services::CephGrafana - -- imagename: "{{namespace}}/{{name_prefix}}tempest{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerTempestImage - services: - - OS::TripleO::Services::Tempest - -- imagename: "{{namespace}}/{{name_prefix}}rsyslog{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerRsyslogImage - - ContainerRsyslogConfigImage - - ContainerRsyslogSidecarImage - - ContainerRsyslogSidecarConfigImage - - ContainerOctaviaRsyslogImage - services: - - OS::TripleO::Services::HAproxy - - OS::TripleO::Services::OctaviaHealthManager - - OS::TripleO::Services::Rsyslog - - OS::TripleO::Services::SwiftProxy - - OS::TripleO::Services::SwiftStorage - -{% if ceph3_namespace is defined %} -- imagename: "{{ceph3_namespace}}/{{ceph3_image}}:{{ceph3_tag}}" - image_source: ceph - params: - - ContainerCeph3DaemonImage - services: - - OS::TripleO::Services::CephClient - - OS::TripleO::Services::CephExternal - - OS::TripleO::Services::CephMds - - OS::TripleO::Services::CephMgr - - OS::TripleO::Services::CephMon - - OS::TripleO::Services::CephOSD - - OS::TripleO::Services::CephRgw - - OS::TripleO::Services::CephRbdMirror -{% endif %} - -{% if namespace_stein is defined %} -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}cinder-api{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerCinderApiImageStein - services: - - OS::TripleO::Services::CinderApi - - OS::TripleO::Services::UndercloudCinderApi - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}glance-api{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerGlanceApiImageStein - services: - - OS::TripleO::Services::GlanceApi - - OS::TripleO::Services::GlanceApiEdge - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}manila-api{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerManilaApiImageStein - services: - - OS::TripleO::Services::ManilaApi - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}heat-engine{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerHeatEngineImageStein - services: - - OS::TripleO::Services::HeatEngine - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}ironic-api{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerIronicApiImageStein - services: - - OS::TripleO::Services::IronicApi - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}ironic-inspector{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerIronicInspectorImageStein - services: - - OS::TripleO::Services::IronicInspector - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}keystone{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerKeystoneImageStein - services: - - OS::TripleO::Services::Keystone - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}mistral-api{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerMistralApiImageStein - services: - - OS::TripleO::Services::MistralApi - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}neutron-server{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerNeutronApiImageStein - services: - - OS::TripleO::Services::NeutronApi - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}nova-api{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerNovaApiImageStein - services: - - OS::TripleO::Services::NovaApi - -- imagename: "{{namespace_stein}}/{{name_prefix_stein}}nova-conductor{{name_suffix_stein}}:{{tag_stein}}" - image_source: kolla - params: - - ContainerNovaConductorImageStein - services: - - OS::TripleO::Services::NovaConductor -{% endif %} diff --git a/contrib/overcloud_containers.yaml b/contrib/overcloud_containers.yaml deleted file mode 120000 index 3f8176a9b..000000000 --- a/contrib/overcloud_containers.yaml +++ /dev/null @@ -1 +0,0 @@ -../container-images/overcloud_containers.yaml \ No newline at end of file