openstack
/
openstack-virtual-baremetal
Code Issues Proposed changes

Revert changes to deploy.py in c13640 and update unit tests 

Revert the change to _process_role() method done in commit:
c1364026fa. Passing networks
will only be supported via parameters_defaults.

Update the unit tests to include the data in parameter_defaults.
This commit is contained in:
Harald Jensås 2018-10-18 12:48:02 +02:00
parent a16f379e1b
commit 026eeb342b
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
openstack_virtual_baremetal/deploy.py
View File

@ -356,14 +356,11 @@ def _process_role(role_file, base_envs, stack_name, args):
_add_identifier(role_env, 'overcloud_storage_net', args.id)
_add_identifier(role_env, 'overcloud_storage_mgmt_net', args.id)
_add_identifier(role_env, 'overcloud_tenant_net', args.id)
if not role_env['parameter_defaults'].get('networks'):
role_env['parameter_defaults']['networks'] = {}
for k, v in {'private': 'private_net',
'provision': 'provision_net',
'public': 'public_net'}.items():
role_env['parameter_defaults']['networks'].update(
{k: role_env['parameter_defaults'].get(
v, role_env['parameters'].get(v, k))})
role_env['parameter_defaults']['networks'] = {
'private': role_env['parameter_defaults']['private_net'],
'provision': role_env['parameter_defaults']['provision_net'],
'public': role_env['parameter_defaults']['public_net'],
}
role_file = 'env-%s-%s.yaml' % (stack_name, role)
_write_role_file(role_env, role_file)
return role_file, role

7
openstack_virtual_baremetal/tests/test_deploy.py
View File

@ -213,7 +213,6 @@ role_base_data = {
'undercloud_image': 'centos7-base',
'baremetal_image': 'ipxe-boot',
'external_net': 'external',
'private_net': 'private',
'baremetal_prefix': 'baremetal-foo-control',
'undercloud_flavor': 'undercloud-16',
'node_count': 3,
@ -229,6 +228,9 @@ role_base_data = {
role_specific_data = {
'parameter_defaults': {
'role': 'compute',
'public_net': 'public',
'private_net': 'private',
'provision_net': 'provision',
},
'parameters': {
'key_name': 'default',
@ -254,16 +256,13 @@ role_original_data = {
'undercloud_name': 'undercloud',
'baremetal_flavor': 'baremetal',
'os_auth_url': 'http://1.1.1.1:5000/v2.0',
'provision_net': 'provision',
'bmc_image': 'bmc-base',
'os_tenant': 'admin',
'bmc_prefix': 'bmc',
'public_net': 'public',
'undercloud_image': 'centos7-base',
'baremetal_image': 'ipxe-boot',
'external_net': 'external',
'os_password': 'password',
'private_net': 'private',
'undercloud_flavor': 'undercloud-16',
'node_count': 3,
'bmc_flavor': 'bmc'