Merge "Remove the base layers" into stable/train

This commit is contained in:
Zuul 2020-09-24 16:36:07 +00:00 committed by Gerrit Code Review
commit a39f9fc07a
3 changed files with 0 additions and 101 deletions

View File

@ -1,10 +1,4 @@
container_images:
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-os:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-aodh-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-aodh-api:current-tripleo
- image_source: tripleo
@ -13,16 +7,12 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-aodh-listener:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-aodh-notifier:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-barbican-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-barbican-api:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-barbican-keystone-listener:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-barbican-worker:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ceilometer-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ceilometer-central:current-tripleo
- image_source: tripleo
@ -31,8 +21,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-ceilometer-ipmi:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ceilometer-notification:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-cinder-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-cinder-api:current-tripleo
- image_source: tripleo
@ -45,8 +33,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-collectd:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-cron:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-designate-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-designate-api:current-tripleo
- image_source: tripleo
@ -69,8 +55,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-fluentd:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-glance-api:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-gnocchi-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-gnocchi-api:current-tripleo
- image_source: tripleo
@ -79,8 +63,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-gnocchi-statsd:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-haproxy:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-heat-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-heat-all:current-tripleo
- image_source: tripleo
@ -91,8 +73,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-heat-engine:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-horizon:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ironic-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ironic-api:current-tripleo
- image_source: tripleo
@ -109,8 +89,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-keepalived:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-keystone:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-manila-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-manila-api:current-tripleo
- image_source: tripleo
@ -121,8 +99,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-mariadb:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-memcached:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-mistral-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-mistral-api:current-tripleo
- image_source: tripleo
@ -133,10 +109,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-mistral-executor:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-multipathd:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-neutron-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-neutron-agent-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-neutron-dhcp-agent:current-tripleo
- image_source: tripleo
@ -157,8 +129,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-neutron-server:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-neutron-sriov-agent:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-nova-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-nova-api:current-tripleo
- image_source: tripleo
@ -175,14 +145,10 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-nova-scheduler:current-tripleo
- image_source: kolla
imagename: docker.io/tripleotrain/centos-binary-nova-serialproxy:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-novajoin-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-novajoin-notifier:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-novajoin-server:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-octavia-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-octavia-api:current-tripleo
- image_source: tripleo
@ -193,8 +159,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-octavia-worker:current-tripleo
- image_source: kolla
imagename: docker.io/tripleotrain/centos-binary-opendaylight:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ovn-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-ovn-controller:current-tripleo
- image_source: tripleo
@ -221,8 +185,6 @@ container_images:
imagename: docker.io/tripleotrain/centos-binary-sahara-engine:current-tripleo
- image_source: kolla
imagename: docker.io/tripleotrain/centos-binary-sensu-client:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-swift-base:current-tripleo
- image_source: tripleo
imagename: docker.io/tripleotrain/centos-binary-swift-account:current-tripleo
- image_source: tripleo

View File

@ -1,14 +1,5 @@
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:
@ -48,9 +39,6 @@ container_images_template:
- 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:
@ -77,9 +65,6 @@ container_images_template:
- 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:
@ -117,9 +102,6 @@ container_images_template:
- OS::TripleO::Services::CeilometerAgentNotification
- OS::TripleO::Services::UndercloudCeilometerAgentNotification
- 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:
@ -175,9 +157,6 @@ container_images_template:
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:
@ -270,9 +249,6 @@ container_images_template:
- 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:
@ -312,9 +288,6 @@ container_images_template:
- 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
@ -351,9 +324,6 @@ container_images_template:
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:
@ -419,9 +389,6 @@ container_images_template:
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:
@ -465,9 +432,6 @@ container_images_template:
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:
@ -508,12 +472,6 @@ container_images_template:
services:
- OS::TripleO::Services::Multipathd
- imagename: "{{namespace}}/{{name_prefix}}neutron-base{{name_suffix}}:{{tag}}"
image_source: tripleo
- imagename: "{{namespace}}/{{name_prefix}}neutron-agent-base{{name_suffix}}:{{tag}}"
image_source: tripleo
- imagename: "{{namespace}}/{{name_prefix}}neutron-dhcp-agent{{name_suffix}}:{{tag}}"
image_source: tripleo
params:
@ -606,9 +564,6 @@ container_images_template:
services:
- OS::TripleO::Services::NeutronSriovAgent
- 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:
@ -677,9 +632,6 @@ container_images_template:
services:
- OS::TripleO::Services::NovaSerialproxy
- 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:
@ -695,9 +647,6 @@ container_images_template:
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:
@ -742,9 +691,6 @@ container_images_template:
- OS::TripleO::Services::OpenDaylightApi
{% endif %}
{% 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:
@ -866,9 +812,6 @@ container_images_template:
- OS::TripleO::Services::SensuClient
{% endif %}
- 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:

View File

@ -462,9 +462,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
{'image_source': 'kolla',
'imagename': 'docker.io/tripleotrain/centos-binary'
'-opendaylight:current-tripleo'},
{'image_source': 'tripleo',
'imagename': 'docker.io/tripleotrain/centos-binary-ovn-'
'base:current-tripleo'},
{'image_source': 'tripleo',
'imagename': 'docker.io/tripleotrain/centos-binary'
'-ovn-northd:current-tripleo'},
@ -493,9 +490,6 @@ class TestKollaImageBuilderTemplate(base.TestCase):
{'image_source': 'tripleo',
'imagename': 'docker.io/tripleotrain/centos-binary'
'-neutron-server-ovn:current-tripleo'},
{'image_source': 'tripleo',
'imagename': 'docker.io/tripleotrain/centos-binary'
'-ovn-base:current-tripleo'},
{'image_source': 'tripleo',
'imagename': 'docker.io/tripleotrain/centos-binary'
'-ovn-northd:current-tripleo'},