Switch to tripleo_containers.yaml
In older versions we used the overcloud_containers.yaml.j2 to perform the service mapping to container names. These containers have image_source: kolla. Since we've implemented tcib, we have a new image_source: tripleo which sould be used. Change-Id: I79a9bb831339567fad0eecf5aed4af74ceb07b57
This commit is contained in:
parent
f4d312f186
commit
74799d9beb
@ -10,7 +10,7 @@ parameter_defaults:
|
||||
# push_destination: true
|
||||
|
||||
# Substitutions to be made when processing the template file
|
||||
# <prefix>/share/tripleo-common/container-images/overcloud_containers.yaml.j2
|
||||
# <prefix>/share/tripleo-common/container-images/tripleo_containers.yaml.j2
|
||||
set:
|
||||
# Container image name components for OpenStack images.
|
||||
namespace: docker.io/tripleomaster
|
||||
|
@ -1,222 +1,220 @@
|
||||
container_images:
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-os:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-aodh-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-aodh-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-aodh-evaluator:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-aodh-listener:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-aodh-notifier:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-barbican-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-barbican-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-barbican-keystone-listener:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-barbican-worker:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ceilometer-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ceilometer-ipmi:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ceilometer-central:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ceilometer-compute:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ceilometer-notification:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-cinder-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-cinder-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-cinder-backup:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-cinder-scheduler:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-cinder-volume:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-collectd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-cron:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-backend-bind9:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-central:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-mdns:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-producer:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-sink:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-designate-worker:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-etcd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-glance-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-gnocchi-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-gnocchi-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-gnocchi-metricd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-gnocchi-statsd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-haproxy:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-heat-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-heat-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-heat-api-cfn:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-heat-engine:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-heat-all:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-horizon:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ironic-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ironic-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ironic-conductor:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ironic-inspector:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ironic-neutron-agent:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ironic-pxe:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-iscsid:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-keepalived:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-keystone:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-manila-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-manila-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-manila-scheduler:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-manila-share:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-mariadb:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-memcached:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-mistral-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-mistral-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-mistral-engine:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-mistral-event-engine:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-mistral-executor:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-multipathd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-agent-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-dhcp-agent:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-l3-agent:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-metadata-agent-ovn:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-metadata-agent:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-openvswitch-agent:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-server:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-server-ovn:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-neutron-sriov-agent:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-libvirt:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-compute:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-compute-ironic:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-conductor:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-novncproxy:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-nova-scheduler:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-novajoin-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-novajoin-notifier:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-novajoin-server:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-octavia-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-octavia-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-octavia-health-manager:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-octavia-housekeeping:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-octavia-worker:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ovn-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ovn-controller:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ovn-northd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ovn-nb-db-server:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-ovn-sb-db-server:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-placement-api:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-qdrouterd:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-rabbitmq:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-redis:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-rsyslog:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-swift-base:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-swift-account:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-swift-container:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-swift-object:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-swift-proxy-server:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-tempest:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-tripleoclient:current-tripleo
|
||||
- image_source: tripleo
|
||||
imagename: quay.io/tripleomaster/openstack-zaqar-wsgi:current-tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-os:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-aodh-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-aodh-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-aodh-evaluator:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-aodh-listener:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-aodh-notifier:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-barbican-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-barbican-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-barbican-keystone-listener:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-barbican-worker:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ceilometer-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ceilometer-central:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ceilometer-compute:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ceilometer-notification:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ceilometer-ipmi:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-cinder-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-cinder-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-cinder-backup:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-cinder-scheduler:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-cinder-volume:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-collectd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-cron:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-central:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-mdns:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-producer:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-sink:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-designate-worker:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-glance-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-gnocchi-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-gnocchi-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-gnocchi-metricd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-gnocchi-statsd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-haproxy:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-heat-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-heat-all:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-heat-api-cfn:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-heat-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-heat-engine:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-horizon:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ironic-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ironic-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ironic-conductor:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ironic-inspector:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ironic-pxe:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ironic-neutron-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-iscsid:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-keepalived:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-keystone:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-manila-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-manila-scheduler:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-manila-share:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-mariadb:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-memcached:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-mistral-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-mistral-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-mistral-engine:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-mistral-executor:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-mistral-event-engine:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-multipathd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-agent-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-dhcp-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-l3-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-openvswitch-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-sriov-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-mlnx-agent:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-compute-ironic:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-compute:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-conductor:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-libvirt:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-novncproxy:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-novajoin-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-novajoin-notifier:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-octavia-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-octavia-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-octavia-health-manager:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-octavia-housekeeping:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ovn-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ovn-controller:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ovn-nb-db-server:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ovn-northd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-placement-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-qdrouterd:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-rabbitmq:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-redis:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-sahara-api:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-base:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-account:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-container:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-object:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-swift-proxy-server:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-zaqar-wsgi:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/ceph/daemon:v4.0.12-stable-4.0-nautilus-centos-7-x86_64
|
||||
image_source: ceph
|
||||
- imagename: docker.io/prom/prometheus:v2.7.2
|
||||
@ -225,5 +223,9 @@ container_images:
|
||||
image_source: prom
|
||||
- imagename: docker.io/prom/node-exporter:v0.17.0
|
||||
image_source: prom
|
||||
- imagename: docker.io/grafana/grafana:5.2.4
|
||||
- imagename: docker.io/grafana/grafana:5.4.3
|
||||
image_source: grafana
|
||||
- imagename: docker.io/tripleomaster/centos-binary-tempest:current-tripleo
|
||||
image_source: tripleo
|
||||
- imagename: docker.io/tripleomaster/centos-binary-rsyslog:current-tripleo
|
||||
image_source: tripleo
|
||||
|
879
container-images/tripleo_containers.yaml.j2
Normal file
879
container-images/tripleo_containers.yaml.j2
Normal file
@ -0,0 +1,879 @@
|
||||
container_images_template:
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}os{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}aodh-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}aodh-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerAodhEvaluatorImage
|
||||
services:
|
||||
- OS::TripleO::Services::AodhEvaluator
|
||||
- OS::TripleO::Services::UndercloudAodhEvaluator
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}aodh-listener{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerAodhListenerImage
|
||||
services:
|
||||
- OS::TripleO::Services::AodhListener
|
||||
- OS::TripleO::Services::UndercloudAodhListener
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}aodh-notifier{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerAodhNotifierImage
|
||||
services:
|
||||
- OS::TripleO::Services::AodhNotifier
|
||||
- OS::TripleO::Services::UndercloudAodhNotifier
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}barbican-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}barbican-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerBarbicanApiImage
|
||||
- ContainerBarbicanConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::BarbicanApi
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}barbican-keystone-listener{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerBarbicanKeystoneListenerImage
|
||||
- ContainerBarbicanKeystoneListenerConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::BarbicanApi
|
||||
- OS::TripleO::Services::BarbicanKeystoneListener
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}barbican-worker{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerBarbicanWorkerImage
|
||||
- ContainerBarbicanWorkerConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::BarbicanApi
|
||||
- OS::TripleO::Services::BarbicanWorker
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ceilometer-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ceilometer-central{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerCeilometerComputeImage
|
||||
services:
|
||||
- OS::TripleO::Services::ComputeCeilometerAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ceilometer-notification{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerCeilometerNotificationImage
|
||||
services:
|
||||
- OS::TripleO::Services::CeilometerAgentNotification
|
||||
- OS::TripleO::Services::UndercloudCeilometerAgentNotification
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ceilometer-ipmi{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerCeilometerIpmiImage
|
||||
services:
|
||||
- OS::TripleO::Services::CeilometerAgentIpmi
|
||||
- OS::TripleO::Services::UndercloudCeilometerAgentIpmi
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}cinder-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}cinder-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerCinderBackupImage
|
||||
services:
|
||||
- OS::TripleO::Services::CinderBackup
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}cinder-scheduler{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerCinderSchedulerImage
|
||||
services:
|
||||
- OS::TripleO::Services::CinderScheduler
|
||||
- OS::TripleO::Services::UndercloudCinderScheduler
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}cinder-volume{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerCollectdConfigImage
|
||||
- ContainerCollectdImage
|
||||
services:
|
||||
- OS::TripleO::Services::Collectd
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}cron{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerCrondConfigImage
|
||||
- ContainerCrondImage
|
||||
services:
|
||||
- OS::TripleO::Services::ContainersLogrotateCrond
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerDesignateBackendBIND9Image
|
||||
services:
|
||||
- OS::TripleO::Services::DesignateWorker
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-central{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerDesignateCentralImage
|
||||
services:
|
||||
- OS::TripleO::Services::DesignateCentral
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-mdns{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerDesignateMDNSImage
|
||||
services:
|
||||
- OS::TripleO::Services::DesignateMDNS
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-producer{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerDesignateProducerImage
|
||||
services:
|
||||
- OS::TripleO::Services::DesignateProducer
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-sink{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerDesignateSinkImage
|
||||
services:
|
||||
- OS::TripleO::Services::DesignateSink
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}designate-worker{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerDesignateConfigImage
|
||||
- ContainerDesignateWorkerImage
|
||||
services:
|
||||
- OS::TripleO::Services::DesignateWorker
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}etcd{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerEtcdConfigImage
|
||||
- ContainerEtcdImage
|
||||
services:
|
||||
- OS::TripleO::Services::Etcd
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}glance-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerGlanceApiConfigImage
|
||||
- ContainerGlanceApiImage
|
||||
services:
|
||||
- OS::TripleO::Services::GlanceApi
|
||||
- OS::TripleO::Services::GlanceApiEdge
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}gnocchi-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}gnocchi-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerGnocchiMetricdImage
|
||||
services:
|
||||
- OS::TripleO::Services::GnocchiMetricd
|
||||
- OS::TripleO::Services::UndercloudGnocchiMetricd
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}gnocchi-statsd{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerGnocchiStatsdImage
|
||||
services:
|
||||
- OS::TripleO::Services::GnocchiStatsd
|
||||
- OS::TripleO::Services::UndercloudGnocchiStatsd
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}haproxy{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerHAProxyConfigImage
|
||||
- ContainerHAProxyImage
|
||||
services:
|
||||
- OS::TripleO::Services::HAproxy
|
||||
- OS::TripleO::Services::HAproxyEdge
|
||||
- OS::TripleO::Services::UndercloudHAProxy
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}heat-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}heat-all{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}heat-api-cfn{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerHeatApiCfnConfigImage
|
||||
- ContainerHeatApiCfnImage
|
||||
services:
|
||||
- OS::TripleO::Services::HeatApiCfn
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}heat-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerHeatApiConfigImage
|
||||
- ContainerHeatApiImage
|
||||
- ContainerHeatConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::HeatApi
|
||||
- OS::TripleO::Services::HeatEngine
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}heat-engine{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerHeatEngineImage
|
||||
services:
|
||||
- OS::TripleO::Services::HeatEngine
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}horizon{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerHorizonConfigImage
|
||||
- ContainerHorizonImage
|
||||
services:
|
||||
- OS::TripleO::Services::Horizon
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ironic-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ironic-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerIronicApiImage
|
||||
- ContainerIronicApiConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::IronicApi
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ironic-conductor{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerIronicConductorImage
|
||||
services:
|
||||
- OS::TripleO::Services::IronicConductor
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ironic-inspector{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerIronicInspectorImage
|
||||
- ContainerIronicInspectorConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::IronicInspector
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ironic-pxe{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerIronicConfigImage
|
||||
- ContainerIronicPxeImage
|
||||
services:
|
||||
- OS::TripleO::Services::IronicConductor
|
||||
- OS::TripleO::Services::IronicPxe
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ironic-neutron-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerIronicNeutronAgentImage
|
||||
- ContainerNeutronConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::IronicNeutronAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}iscsid{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerIscsidConfigImage
|
||||
- ContainerIscsidImage
|
||||
services:
|
||||
- OS::TripleO::Services::Iscsid
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}keepalived{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerKeepalivedConfigImage
|
||||
- ContainerKeepalivedImage
|
||||
services:
|
||||
- OS::TripleO::Services::Keepalived
|
||||
- OS::TripleO::Services::UndercloudKeepalived
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}keystone{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerKeystoneConfigImage
|
||||
- ContainerKeystoneImage
|
||||
services:
|
||||
- OS::TripleO::Services::Keystone
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}manila-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}manila-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerManilaSchedulerImage
|
||||
services:
|
||||
- OS::TripleO::Services::ManilaScheduler
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}manila-share{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerManilaShareImage
|
||||
services:
|
||||
- OS::TripleO::Services::ManilaShare
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}mariadb{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerClustercheckConfigImage
|
||||
- ContainerClustercheckImage
|
||||
- ContainerMysqlConfigImage
|
||||
- ContainerMysqlImage
|
||||
- ContainerMysqlClientConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::MySQL
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}memcached{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerMemcachedConfigImage
|
||||
- ContainerMemcachedImage
|
||||
services:
|
||||
- OS::TripleO::Services::Memcached
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}mistral-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}mistral-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerMistralEngineImage
|
||||
services:
|
||||
- OS::TripleO::Services::MistralEngine
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}mistral-executor{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerMistralExecutorImage
|
||||
services:
|
||||
- OS::TripleO::Services::MistralExecutor
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}mistral-event-engine{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerMistralEventEngineImage
|
||||
services:
|
||||
- OS::TripleO::Services::MistralEventEngine
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}multipathd{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerMultipathdConfigImage
|
||||
- ContainerMultipathdImage
|
||||
services:
|
||||
- OS::TripleO::Services::Multipathd
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-agent-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-dhcp-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNeutronDHCPImage
|
||||
services:
|
||||
- OS::TripleO::Services::NeutronDhcpAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-l3-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNeutronL3AgentImage
|
||||
services:
|
||||
- OS::TripleO::Services::NeutronL3Agent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNeutronMetadataImage
|
||||
services:
|
||||
- OS::TripleO::Services::NeutronMetadataAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-openvswitch-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOpenvswitchImage
|
||||
services:
|
||||
- OS::TripleO::Services::ComputeNeutronOvsAgent
|
||||
- OS::TripleO::Services::NeutronOvsAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-sriov-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNeutronSriovImage
|
||||
services:
|
||||
- OS::TripleO::Services::NeutronSriovAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-mlnx-agent{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNeutronMlnxImage
|
||||
services:
|
||||
- OS::TripleO::Services::NeutronMlnxAgent
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-server{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerOvnMetadataImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNMetadataAgent
|
||||
{% endif %}
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerNovaComputeIronicImage
|
||||
services:
|
||||
- OS::TripleO::Services::NovaIronic
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-compute{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerNovaConductorImage
|
||||
services:
|
||||
- OS::TripleO::Services::NovaConductor
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-libvirt{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNovaLibvirtImage
|
||||
services:
|
||||
- OS::TripleO::Services::NovaLibvirt
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-novncproxy{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNovaVncProxyImage
|
||||
services:
|
||||
- OS::TripleO::Services::NovaVncProxy
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-scheduler{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNovaSchedulerImage
|
||||
services:
|
||||
- OS::TripleO::Services::NovaScheduler
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}novajoin-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}novajoin-notifier{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNovajoinNotifierImage
|
||||
services:
|
||||
- OS::TripleO::Services::Novajoin
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}novajoin-server{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerNovajoinServerImage
|
||||
- ContainerNovajoinConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::Novajoin
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}octavia-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}octavia-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerOctaviaHealthManagerImage
|
||||
services:
|
||||
- OS::TripleO::Services::OctaviaHealthManager
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}octavia-housekeeping{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOctaviaHousekeepingImage
|
||||
services:
|
||||
- OS::TripleO::Services::OctaviaHousekeeping
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}octavia-worker{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOctaviaWorkerImage
|
||||
services:
|
||||
- OS::TripleO::Services::OctaviaWorker
|
||||
|
||||
{% if neutron_driver == "ovn" %}
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ovn-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOvnControllerConfigImage
|
||||
- ContainerOvnControllerImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNController
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ovn-nb-db-server{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOvnNbDbImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNDBs
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ovn-northd{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOvnNorthdImage
|
||||
- ContainerOvnDbsImage
|
||||
- ContainerOvnDbsConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNDBs
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}ovn-sb-db-server{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerOvnSbDbImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNDBs
|
||||
{% endif %}
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}placement-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerPlacementConfigImage
|
||||
- ContainerPlacementImage
|
||||
services:
|
||||
- OS::TripleO::Services::PlacementApi
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}qdrouterd{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerRedisConfigImage
|
||||
- ContainerRedisImage
|
||||
services:
|
||||
- OS::TripleO::Services::Redis
|
||||
- OS::TripleO::Services::UndercloudRedis
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}sahara-api{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerSaharaApiImage
|
||||
- ContainerSaharaConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::SaharaApi
|
||||
- OS::TripleO::Services::SaharaEngine
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}sahara-engine{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerSaharaEngineImage
|
||||
services:
|
||||
- OS::TripleO::Services::SaharaEngine
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}swift-base{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}swift-account{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerSwiftAccountImage
|
||||
services:
|
||||
- OS::TripleO::Services::SwiftStorage
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}swift-container{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerSwiftContainerImage
|
||||
services:
|
||||
- OS::TripleO::Services::SwiftStorage
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}swift-object{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
params:
|
||||
- ContainerSwiftObjectImage
|
||||
services:
|
||||
- OS::TripleO::Services::SwiftStorage
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}swift-proxy-server{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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: tripleo
|
||||
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: tripleo
|
||||
params:
|
||||
- ContainerTempestImage
|
||||
services:
|
||||
- OS::TripleO::Services::Tempest
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}rsyslog{{name_suffix}}:{{tag}}"
|
||||
image_source: tripleo
|
||||
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
|
@ -0,0 +1,6 @@
|
||||
---
|
||||
other:
|
||||
- |
|
||||
`container-images/tripleo_containers.yaml.j2` is now used to determine what
|
||||
containers are used for which services when running the container image
|
||||
prepare process runs.
|
@ -52,7 +52,7 @@ def init_prepare_defaults(defaults_file):
|
||||
|
||||
DEFAULT_TEMPLATE_FILE = os.path.join(sys.prefix, 'share', 'tripleo-common',
|
||||
'container-images',
|
||||
'overcloud_containers.yaml.j2')
|
||||
'tripleo_containers.yaml.j2')
|
||||
|
||||
DEFAULT_PREPARE_FILE = os.path.join(sys.prefix, 'share', 'tripleo-common',
|
||||
'container-images',
|
||||
|
@ -29,7 +29,7 @@ from tripleo_common.tests import base
|
||||
|
||||
TEMPLATE_PATH = os.path.join(os.path.dirname(__file__),
|
||||
'..', '..', '..', 'container-images',
|
||||
'overcloud_containers.yaml.j2')
|
||||
'tripleo_containers.yaml.j2')
|
||||
|
||||
|
||||
DEFAULTS_PATH = os.path.join(os.path.dirname(__file__),
|
||||
@ -358,15 +358,15 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||
def _test_container_images_yaml_in_sync_helper(self, neutron_driver=None,
|
||||
rhel_containers=False,
|
||||
remove_images=[]):
|
||||
'''Confirm overcloud_containers.tpl.yaml equals overcloud_containers.yaml
|
||||
'''Confirm overcloud_containers.tpl.yaml equals tripleo_containers.yaml
|
||||
|
||||
TODO(sbaker) remove when overcloud_containers.yaml is deleted
|
||||
TODO(sbaker) remove when tripleo_containers.yaml is deleted
|
||||
'''
|
||||
mod_dir = os.path.dirname(sys.modules[__name__].__file__)
|
||||
project_dir = os.path.abspath(os.path.join(mod_dir, '../../../'))
|
||||
files_dir = os.path.join(project_dir, 'container-images')
|
||||
|
||||
oc_tmpl_file = os.path.join(files_dir, 'overcloud_containers.yaml.j2')
|
||||
oc_tmpl_file = os.path.join(files_dir, 'tripleo_containers.yaml.j2')
|
||||
tmpl_builder = kb.KollaImageBuilder([oc_tmpl_file])
|
||||
|
||||
def ffunc(entry):
|
||||
@ -380,12 +380,12 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||
filter=ffunc, neutron_driver=neutron_driver,
|
||||
rhel_containers=rhel_containers)
|
||||
|
||||
oc_yaml_file = os.path.join(files_dir, 'overcloud_containers.yaml')
|
||||
oc_yaml_file = os.path.join(files_dir, 'tripleo_containers.yaml')
|
||||
yaml_builder = kb.KollaImageBuilder([oc_yaml_file])
|
||||
container_images = yaml_builder.load_config_files(
|
||||
yaml_builder.CONTAINER_IMAGES)
|
||||
|
||||
# remove image references from overcloud_containers.yaml specified
|
||||
# remove image references from tripleo_containers.yaml specified
|
||||
# in remove_images param.
|
||||
for image in remove_images:
|
||||
container_images.remove(image)
|
||||
@ -394,26 +394,29 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
||||
|
||||
def test_container_images_yaml_in_sync(self):
|
||||
remove_images = [
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'ovn-base:' + KB_DEFAULT_TAG},
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'ovn-northd:' + KB_DEFAULT_TAG},
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'ovn-controller:' + KB_DEFAULT_TAG},
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'ovn-nb-db-server:' + KB_DEFAULT_TAG},
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'ovn-sb-db-server:' + KB_DEFAULT_TAG},
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': KB_DEFAULT_NAMESPACE + '/' + KB_DEFAULT_PREFIX +
|
||||
'neutron-metadata-agent-ovn:' + KB_DEFAULT_TAG}]
|
||||
self._test_container_images_yaml_in_sync_helper(
|
||||
remove_images=remove_images)
|
||||
|
||||
def test_container_images_yaml_in_sync_for_ovn(self):
|
||||
# remove neutron-server image reference from overcloud_containers.yaml
|
||||
# remove neutron-server image reference from tripleo_containers.yaml
|
||||
remove_images = []
|
||||
self._test_container_images_yaml_in_sync_helper(
|
||||
neutron_driver='ovn', remove_images=remove_images)
|
||||
@ -472,7 +475,7 @@ class TestPrepare(base.TestCase):
|
||||
def test_prepare_simple(self, mock_insecure):
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': '192.0.2.0:8787/t/p-nova-compute:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
@ -501,7 +504,7 @@ class TestPrepare(base.TestCase):
|
||||
def test_prepare_includes(self, mock_insecure):
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
@ -528,7 +531,7 @@ class TestPrepare(base.TestCase):
|
||||
# assert same result as includes only. includes trumps excludes
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': '192.0.2.0:8787/t/p-nova-libvirt:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
@ -555,7 +558,7 @@ class TestPrepare(base.TestCase):
|
||||
def test_prepare_push_dest(self, mock_insecure):
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [{
|
||||
'image_source': 'kolla',
|
||||
'image_source': 'tripleo',
|
||||
'imagename': 'docker.io/t/p-nova-api:l',
|
||||
'push_destination': '192.0.2.0:8787',
|
||||
}],
|
||||
@ -591,7 +594,7 @@ class TestPrepare(base.TestCase):
|
||||
mock_gur.return_value = '192.0.2.0:8787'
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [{
|
||||
'image_source': 'kolla',
|
||||
'image_source': 'tripleo',
|
||||
'imagename': 'docker.io/t/p-nova-api:l',
|
||||
'push_destination': '192.0.2.0:8787',
|
||||
}],
|
||||
@ -649,7 +652,7 @@ class TestPrepare(base.TestCase):
|
||||
def test_prepare_neutron_driver_default(self, mock_insecure):
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': 't/p-neutron-server:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
@ -678,9 +681,9 @@ class TestPrepare(base.TestCase):
|
||||
def test_prepare_neutron_driver_ovn(self, mock_insecure):
|
||||
self.assertEqual({
|
||||
'container_images.yaml': [
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': 't/p-neutron-server:l'},
|
||||
{'image_source': 'kolla',
|
||||
{'image_source': 'tripleo',
|
||||
'imagename': 't/p-ovn-controller:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
|
@ -1031,7 +1031,7 @@ class PlanTest(base.TestCase):
|
||||
|
||||
kib.assert_called_once_with(
|
||||
[os.path.join(sys.prefix, 'share', 'tripleo-common',
|
||||
'container-images', 'overcloud_containers.yaml.j2')]
|
||||
'container-images', 'tripleo_containers.yaml.j2')]
|
||||
)
|
||||
params = {
|
||||
'ContainerNovaComputeImage': 't/cb-nova-compute:liberty',
|
||||
|
@ -302,7 +302,7 @@ def default_image_params():
|
||||
|
||||
template_file = os.path.join(sys.prefix, 'share', 'tripleo-common',
|
||||
'container-images',
|
||||
'overcloud_containers.yaml.j2')
|
||||
'tripleo_containers.yaml.j2')
|
||||
builder = kolla_builder.KollaImageBuilder([template_file])
|
||||
result = builder.container_images_from_template(filter=ffunc)
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user