openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Allow 'container image prepare' to support drivers"

This commit is contained in:
Zuul 2019-02-22 04:39:22 +00:00 committed by Gerrit Code Review
parent 83869524e7 a2c4d07df6
commit 34f3b5663d
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tripleoclient/tests/v1/test_container_image.py
View File

@ -186,10 +186,13 @@ class TestContainerImagePrepare(TestPluginV1):
mock_get.side_effect = requests.exceptions.SSLError('ouch')
mock_bsf.return_value = set(['OS::TripleO::Services::AodhEvaluator'])
resource_registry = {'resource_registry': {
resource_registry = {
'parameter_defaults': {
'NeutronMechanismDrivers': 'ovn',
}, 'resource_registry': {
'OS::TripleO::Services::AodhEvaluator': aodh_file,
'OS::TripleO::Services::AodhApi': aodh_file
}}
}}
pmef.return_value = None, resource_registry
arglist = [
@ -255,6 +258,7 @@ class TestContainerImagePrepare(TestPluginV1):
'ceph_tag': 'mytag',
'ceph_image': 'mydaemon',
'tag': 'passed-ci',
'neutron_driver': 'ovn',
'ceph_namespace': 'myceph',
'name_prefix': 'os-'
},

2
tripleoclient/v1/container_image.py
View File

@ -427,6 +427,8 @@ class PrepareImageFiles(command.Command):
'name_suffix': parsed_args.suffix,
}
self.parse_set_values(mapping_args, parsed_args.set)
pd = env.get('parameter_defaults', {})
kolla_builder.set_neutron_driver(pd, mapping_args)
output_images_file = (parsed_args.output_images_file
or 'container_images.yaml')