openstack/tripleo-common
Code Issues Proposed changes

Merge "overcloud_containers.yaml.j2: remove unused *-base entry"

Browse Source
This commit is contained in:
Zuul 2019-02-11 23:21:00 +00:00 committed by Gerrit Code Review
commit 3482a7758e
3 changed files with 0 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
container-images/overcloud_containers.yaml
View File

@ -39,8 +39,6 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-designate-backend-bind9:current-tripleo
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-designate-base: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
@ -95,8 +93,6 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-manila-api:current-tripleo
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-manila-base: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
@ -157,8 +153,6 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-novajoin-server:current-tripleo
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-octavia-base: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
@ -169,8 +163,6 @@ container_images:
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-opendaylight:current-tripleo
image_source: kolla
- imagename: docker.io/tripleomaster/centos-binary-ovn-base: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

12
container-images/overcloud_containers.yaml.j2
View File

@ -184,9 +184,6 @@ container_images_template:
services:
- OS::TripleO::Services::DesignateWorker
- imagename: "{{namespace}}/{{name_prefix}}designate-base{{name_suffix}}:{{tag}}"
image_source: kolla
- imagename: "{{namespace}}/{{name_prefix}}designate-central{{name_suffix}}:{{tag}}"
image_source: kolla
params:
@ -406,9 +403,6 @@ container_images_template:
- OS::TripleO::Services::ManilaScheduler
- OS::TripleO::Services::ManilaShare
- imagename: "{{namespace}}/{{name_prefix}}manila-base{{name_suffix}}:{{tag}}"
image_source: kolla
- imagename: "{{namespace}}/{{name_prefix}}manila-scheduler{{name_suffix}}:{{tag}}"
image_source: kolla
params:
@ -665,9 +659,6 @@ container_images_template:
services:
- OS::TripleO::Services::Novajoin
- imagename: "{{namespace}}/{{name_prefix}}octavia-base{{name_suffix}}:{{tag}}"
image_source: kolla
- imagename: "{{namespace}}/{{name_prefix}}octavia-api{{name_suffix}}:{{tag}}"
image_source: kolla
params:
@ -711,9 +702,6 @@ container_images_template:
{% endif %}
{% if neutron_driver == "ovn" %}
- imagename: "{{namespace}}/{{name_prefix}}ovn-base{{name_suffix}}:{{tag}}"
image_source: kolla
- imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}"
image_source: kolla
params:

6
tripleo_common/tests/image/test_kolla_builder.py
View File

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