Merge "Drop the nuetron-server-ovn and odl images"
This commit is contained in:
commit
c0134fe894
|
@ -119,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-ovn:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-neutron-metadata-agent-ovn:current-tripleo
|
||||
image_source: kolla
|
||||
- imagename: docker.io/tripleomaster/centos-binary-nova-api:current-tripleo
|
||||
|
|
|
@ -495,25 +495,6 @@ container_images_template:
|
|||
services:
|
||||
- OS::TripleO::Services::NeutronMlnxAgent
|
||||
|
||||
{% if neutron_driver == "ovn" %}
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-server-ovn{{name_suffix}}:{{tag}}"
|
||||
image_source: kolla
|
||||
params:
|
||||
- ContainerNeutronApiImage
|
||||
- ContainerNeutronConfigImage
|
||||
services:
|
||||
- OS::TripleO::Services::NeutronApi
|
||||
- OS::TripleO::Services::NeutronServer
|
||||
- OS::TripleO::Services::OVNController
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent-ovn{{name_suffix}}:{{tag}}"
|
||||
image_source: kolla
|
||||
params:
|
||||
- ContainerOvnMetadataImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNMetadataAgent
|
||||
|
||||
{% else %}
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-server{{name_suffix}}:{{tag}}"
|
||||
image_source: kolla
|
||||
params:
|
||||
|
@ -529,6 +510,15 @@ container_images_template:
|
|||
- OS::TripleO::Services::NeutronOvsAgent
|
||||
- OS::TripleO::Services::NeutronServer
|
||||
- OS::TripleO::Services::NeutronSriovAgent
|
||||
{% if neutron_driver == "ovn" %}
|
||||
- OS::TripleO::Services::OVNController
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}neutron-metadata-agent-ovn{{name_suffix}}:{{tag}}"
|
||||
image_source: kolla
|
||||
params:
|
||||
- ContainerOvnMetadataImage
|
||||
services:
|
||||
- OS::TripleO::Services::OVNMetadataAgent
|
||||
{% endif %}
|
||||
|
||||
- imagename: "{{namespace}}/{{name_prefix}}nova-api{{name_suffix}}:{{tag}}"
|
||||
|
|
|
@ -123,7 +123,6 @@ PASSWORD_PARAMETER_NAMES = (
|
|||
'OctaviaCaKeyPassphrase',
|
||||
'OctaviaHeartbeatKey',
|
||||
'OctaviaPassword',
|
||||
'OpenDaylightPassword',
|
||||
'PacemakerRemoteAuthkey',
|
||||
'PankoPassword',
|
||||
'PcsdPassword',
|
||||
|
|
|
@ -127,9 +127,7 @@ def set_neutron_driver(pd, mapping_args):
|
|||
mapping_args['neutron_driver'] = 'ovn'
|
||||
return
|
||||
nmd = pd['NeutronMechanismDrivers']
|
||||
if 'opendaylight_v2' in nmd:
|
||||
mapping_args['neutron_driver'] = 'odl'
|
||||
elif 'ovn' in nmd:
|
||||
if 'ovn' in nmd:
|
||||
mapping_args['neutron_driver'] = 'ovn'
|
||||
else:
|
||||
mapping_args['neutron_driver'] = 'other'
|
||||
|
|
|
@ -154,7 +154,6 @@ _EXISTING_PASSWORDS = {
|
|||
'public_key': 'public_key'
|
||||
},
|
||||
'LibvirtTLSPassword': 'xCdt9yeamKz8Fb6EGba9u82XU',
|
||||
'OpenDaylightPassword': 'abc487gfh017rmviuq75jdiw7',
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -374,9 +374,6 @@ 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-ovn:current-tripleo'},
|
||||
{'image_source': 'kolla',
|
||||
'imagename': 'docker.io/tripleomaster/centos-binary'
|
||||
'-ovn-northd:current-tripleo'},
|
||||
|
@ -397,18 +394,12 @@ class TestKollaImageBuilderTemplate(base.TestCase):
|
|||
|
||||
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'}]
|
||||
remove_images = []
|
||||
self._test_container_images_yaml_in_sync_helper(
|
||||
neutron_driver='ovn', remove_images=remove_images)
|
||||
|
||||
def test_container_images_yaml_in_sync_for_rhel(self):
|
||||
remove_images = [
|
||||
{'image_source': 'kolla',
|
||||
'imagename': 'docker.io/tripleomaster/centos-binary'
|
||||
'-neutron-server:current-tripleo'},
|
||||
{'image_source': 'kolla',
|
||||
'imagename': 'docker.io/tripleomaster/centos-binary'
|
||||
'-skydive-agent:current-tripleo'},
|
||||
|
@ -680,13 +671,13 @@ class TestPrepare(base.TestCase):
|
|||
self.assertEqual({
|
||||
'container_images.yaml': [
|
||||
{'image_source': 'kolla',
|
||||
'imagename': 't/p-neutron-server-ovn:l'},
|
||||
'imagename': 't/p-neutron-server:l'},
|
||||
{'image_source': 'kolla',
|
||||
'imagename': 't/p-ovn-controller:l'}
|
||||
],
|
||||
'environments/containers-default-parameters.yaml': {
|
||||
'ContainerNeutronApiImage': 't/p-neutron-server-ovn:l',
|
||||
'ContainerNeutronConfigImage': 't/p-neutron-server-ovn:l',
|
||||
'ContainerNeutronApiImage': 't/p-neutron-server:l',
|
||||
'ContainerNeutronConfigImage': 't/p-neutron-server:l',
|
||||
'ContainerOvnControllerConfigImage': 't/p-ovn-controller:l',
|
||||
'ContainerOvnControllerImage': 't/p-ovn-controller:l'
|
||||
}},
|
||||
|
|
|
@ -57,12 +57,9 @@ class TestUpdate(base.TestCase):
|
|||
update.get_exclusive_neutron_driver('sriovnicswitch'))
|
||||
self.assertIsNone(
|
||||
update.get_exclusive_neutron_driver(['sriovnicswitch']))
|
||||
self.assertIsNone(
|
||||
update.get_exclusive_neutron_driver(['sriovnicswitch',
|
||||
'odl']))
|
||||
|
||||
def test_exclusive_neutron_drivers_found(self):
|
||||
for ex in ['ovn', ['ovn'], ['odl', 'ovn'], ['sriovnicswitch', 'ovn']]:
|
||||
for ex in ['ovn', ['ovn'], ['ovn'], ['sriovnicswitch', 'ovn']]:
|
||||
self.assertEqual('ovn',
|
||||
update.get_exclusive_neutron_driver(ex))
|
||||
for ex in ['openvswitch', ['openvswitch'],
|
||||
|
|
Loading…
Reference in New Issue