diff --git a/container-images/overcloud_containers.yaml b/container-images/overcloud_containers.yaml index 13804e3fe..48cb7e90b 100644 --- a/container-images/overcloud_containers.yaml +++ b/container-images/overcloud_containers.yaml @@ -47,12 +47,8 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-designate-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-ec2-api:current-tripleo - image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-etcd:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-fluentd: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 @@ -123,8 +119,6 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-neutron-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-neutron-server-opendaylight:current-tripleo - image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-neutron-server-ovn:current-tripleo image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo @@ -143,8 +137,6 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-nova-scheduler:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-nova-serialproxy: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 @@ -157,8 +149,6 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-octavia-worker:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-opendaylight: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 @@ -167,8 +157,6 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-ovn-sb-db-server:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-panko-api: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 @@ -181,8 +169,6 @@ container_images: image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-sahara-engine:current-tripleo image_source: kolla -- imagename: docker.io/tripleomaster/centos-binary-sensu-client:current-tripleo - image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-skydive-agent:current-tripleo image_source: kolla - imagename: docker.io/tripleomaster/centos-binary-skydive-analyzer:current-tripleo diff --git a/container-images/overcloud_containers.yaml.j2 b/container-images/overcloud_containers.yaml.j2 index ce4260538..dd7e673f8 100644 --- a/container-images/overcloud_containers.yaml.j2 +++ b/container-images/overcloud_containers.yaml.j2 @@ -212,14 +212,6 @@ container_images_template: services: - OS::TripleO::Services::DesignateWorker -- imagename: "{{namespace}}/{{name_prefix}}ec2-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerEc2ApiConfigImage - - ContainerEc2ApiImage - services: - - OS::TripleO::Services::Ec2Api - - imagename: "{{namespace}}/{{name_prefix}}etcd{{name_suffix}}:{{tag}}" image_source: kolla params: @@ -228,18 +220,6 @@ container_images_template: services: - OS::TripleO::Services::Etcd -{% if not rhel_containers %} -- imagename: "{{namespace}}/{{name_prefix}}fluentd{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerFluentdConfigImage - - ContainerFluentdClientImage - - ContainerFluentdImage - services: - - OS::TripleO::Services::FluentdClient - - OS::TripleO::Services::Fluentd -{% endif %} - - imagename: "{{namespace}}/{{name_prefix}}glance-api{{name_suffix}}:{{tag}}" image_source: kolla params: @@ -515,20 +495,7 @@ container_images_template: services: - OS::TripleO::Services::NeutronMlnxAgent -{% if neutron_driver == "odl" %} -- imagename: "{{namespace}}/{{name_prefix}}neutron-server-opendaylight{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNeutronApiImage - - ContainerNeutronConfigImage - services: - - OS::TripleO::Services::NeutronApi - - OS::TripleO::Services::NeutronDhcpAgent - - OS::TripleO::Services::NeutronMetadataAgent - - OS::TripleO::Services::NeutronServer - - OS::TripleO::Services::OpenDaylightApi - -{% elif neutron_driver == "ovn" %} +{% if neutron_driver == "ovn" %} - imagename: "{{namespace}}/{{name_prefix}}neutron-server-ovn{{name_suffix}}:{{tag}}" image_source: kolla params: @@ -624,14 +591,6 @@ container_images_template: services: - OS::TripleO::Services::NovaScheduler -- imagename: "{{namespace}}/{{name_prefix}}nova-serialproxy{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerNovaSerialproxyConfigImage - - ContainerNovaSerialproxyImage - services: - - OS::TripleO::Services::NovaSerialproxy - - imagename: "{{namespace}}/{{name_prefix}}novajoin-notifier{{name_suffix}}:{{tag}}" image_source: kolla params: @@ -681,16 +640,6 @@ container_images_template: services: - OS::TripleO::Services::OctaviaWorker -{% if neutron_driver == "odl" %} -- imagename: "{{namespace}}/{{name_prefix}}opendaylight{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerOpendaylightApiImage - - ContainerOpendaylightConfigImage - services: - - OS::TripleO::Services::OpenDaylightApi -{% endif %} - {% if neutron_driver == "ovn" %} - imagename: "{{namespace}}/{{name_prefix}}ovn-controller{{name_suffix}}:{{tag}}" image_source: kolla @@ -724,15 +673,6 @@ container_images_template: - OS::TripleO::Services::OVNDBs {% endif %} -- imagename: "{{namespace}}/{{name_prefix}}panko-api{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerPankoApiImage - - ContainerPankoConfigImage - services: - - OS::TripleO::Services::PankoApi - - OS::TripleO::Services::UndercloudPankoApi - - imagename: "{{namespace}}/{{name_prefix}}placement-api{{name_suffix}}:{{tag}}" image_source: kolla params: @@ -789,14 +729,6 @@ container_images_template: - OS::TripleO::Services::SaharaEngine {% if not rhel_containers %} -- imagename: "{{namespace}}/{{name_prefix}}sensu-client{{name_suffix}}:{{tag}}" - image_source: kolla - params: - - ContainerSensuClientImage - - ContainerSensuConfigImage - services: - - OS::TripleO::Services::SensuClient - - imagename: "{{namespace}}/{{name_prefix}}skydive-agent{{name_suffix}}:{{tag}}" image_source: kolla params: diff --git a/tripleo_common/tests/image/test_kolla_builder.py b/tripleo_common/tests/image/test_kolla_builder.py index b764c7af1..aaf8194cb 100644 --- a/tripleo_common/tests/image/test_kolla_builder.py +++ b/tripleo_common/tests/image/test_kolla_builder.py @@ -374,15 +374,9 @@ class TestKollaImageBuilderTemplate(base.TestCase): def test_container_images_yaml_in_sync(self): remove_images = [ - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-server-opendaylight:current-tripleo'}, {'image_source': 'kolla', 'imagename': 'docker.io/tripleomaster/centos-binary' '-neutron-server-ovn:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-opendaylight:current-tripleo'}, {'image_source': 'kolla', 'imagename': 'docker.io/tripleomaster/centos-binary' '-ovn-northd:current-tripleo'}, @@ -401,45 +395,12 @@ class TestKollaImageBuilderTemplate(base.TestCase): self._test_container_images_yaml_in_sync_helper( remove_images=remove_images) - def test_container_images_yaml_in_sync_for_odl(self): - # remove neutron-server image reference from overcloud_containers.yaml - remove_images = [ - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-server:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-server-ovn: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-' - '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-' - 'sb-db-server:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-metadata-agent-ovn:current-tripleo'}] - self._test_container_images_yaml_in_sync_helper( - neutron_driver='odl', remove_images=remove_images) - def test_container_images_yaml_in_sync_for_ovn(self): # remove neutron-server image reference from overcloud_containers.yaml remove_images = [ {'image_source': 'kolla', 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-server:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-server-opendaylight:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-opendaylight:current-tripleo'}] + '-neutron-server:current-tripleo'}] self._test_container_images_yaml_in_sync_helper( neutron_driver='ovn', remove_images=remove_images) @@ -448,18 +409,6 @@ class TestKollaImageBuilderTemplate(base.TestCase): {'image_source': 'kolla', 'imagename': 'docker.io/tripleomaster/centos-binary' '-neutron-server:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-neutron-server-opendaylight:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-opendaylight:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-fluentd:current-tripleo'}, - {'image_source': 'kolla', - 'imagename': 'docker.io/tripleomaster/centos-binary' - '-sensu-client:current-tripleo'}, {'image_source': 'kolla', 'imagename': 'docker.io/tripleomaster/centos-binary' '-skydive-agent:current-tripleo'}, @@ -759,41 +708,6 @@ class TestPrepare(base.TestCase): ) ) - @mock.patch('tripleo_common.image.kolla_builder.' - 'detect_insecure_registries', return_value={}) - def test_prepare_neutron_driver_odl(self, mock_insecure): - self.assertEqual({ - 'container_images.yaml': [ - {'image_source': 'kolla', - 'imagename': 't/neutron-server-opendaylight:l'}, - {'image_source': 'kolla', - 'imagename': 't/opendaylight:l'} - ], - 'environments/containers-default-parameters.yaml': { - 'ContainerNeutronApiImage': 't/neutron-server-opendaylight:l', - 'ContainerNeutronConfigImage': - 't/neutron-server-opendaylight:l', - 'ContainerOpendaylightApiImage': 't/opendaylight:l', - 'ContainerOpendaylightConfigImage': 't/opendaylight:l', - }}, - kb.container_images_prepare( - template_file=TEMPLATE_PATH, - output_env_file=constants.CONTAINER_DEFAULTS_ENVIRONMENT, - output_images_file='container_images.yaml', - service_filter=[ - 'OS::TripleO::Services::NeutronServer', - 'OS::TripleO::Services::OpenDaylightApi' - ], - mapping_args={ - 'namespace': 't', - 'name_prefix': '', - 'name_suffix': '', - 'tag': 'l', - 'neutron_driver': 'odl' - } - ) - ) - def test_get_enabled_services_empty(self): self.assertEqual( set([]), @@ -1179,9 +1093,3 @@ class TestPrepare(base.TestCase): mapping_args ) self.assertEqual('ovn', mapping_args['neutron_driver']) - mapping_args = {} - kb.set_neutron_driver( - {'NeutronMechanismDrivers': ['sriovnicswitch', 'opendaylight_v2']}, - mapping_args - ) - self.assertEqual('odl', mapping_args['neutron_driver'])