Merge "node extract provisioned - use network_config_update"
This commit is contained in:
commit
e2ed23516c
|
@ -908,7 +908,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
'count': 1,
|
||||
'hostname_format': '%stackname%-novacompute-%index%',
|
||||
'defaults': {
|
||||
'network_config': {'network_deployment_actions': ['CREATE'],
|
||||
'network_config': {'network_config_update': False,
|
||||
'physical_bridge_name': 'br-ex',
|
||||
'public_interface_name': 'nic1',
|
||||
'template': 'templates/compute.j2'},
|
||||
|
@ -928,7 +928,7 @@ class TestExtractProvisionedNode(test_utils.TestCommand):
|
|||
'hostname_format': '%stackname%-controller-%index%',
|
||||
'defaults': {
|
||||
'network_config': {'default_route_network': ['External'],
|
||||
'network_deployment_actions': ['CREATE'],
|
||||
'network_config_update': False,
|
||||
'networks_skip_config': ['Tenant'],
|
||||
'physical_bridge_name': 'br-ex',
|
||||
'public_interface_name': 'nic1',
|
||||
|
|
|
@ -582,15 +582,14 @@ class ExtractProvisionedNode(command.Command):
|
|||
role_name + 'NetworkConfigTemplate')
|
||||
|
||||
if parameters.get(role_name + 'NetworkDeploymentActions'):
|
||||
net_conf['network_deployment_actions'] = parameters.get(
|
||||
network_deployment_actions = parameters.get(
|
||||
role_name + 'NetworkDeploymentActions')
|
||||
else:
|
||||
net_conf['network_deployment_actions'] = parameters.get(
|
||||
network_deployment_actions = parameters.get(
|
||||
'NetworkDeploymentActions', ['CREATE'])
|
||||
|
||||
if isinstance(net_conf['network_deployment_actions'], str):
|
||||
net_conf['network_deployment_actions'] = net_conf[
|
||||
'network_deployment_actions'].split(',')
|
||||
net_conf['network_config_update'] = (
|
||||
'UPDATE' in network_deployment_actions)
|
||||
|
||||
# The NetConfigDataLookup parameter is of type: json, but when
|
||||
# not set it returns as string '{}'
|
||||
|
|
Loading…
Reference in New Issue