openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Allow nic-config conversion without Heat 

The current script requires the orchestration (Heat)
be available. This change will allow the script to convert
existing templates provided without the orchestration
service present.

Change-Id: Ie94de5841617cd8dc87ee7dccc5d4ece5b908cb9
This commit is contained in:
bshephar 2022-02-16 15:37:55 +00:00
parent a445fbd02b
commit 0c3ea4c286
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tools/convert_heat_nic_config_to_ansible_j2.py
View File

@ -82,6 +82,13 @@ def parse_opts(argv):
parser.add_argument('template',
metavar='TEMPLATE_FILE',
help='Existing NIC config template to convert.')
parser.add_argument('--standalone',
default=False,
action='store_true',
help='This switch allows the script to operate in '
'environments where the orchestration service '
'is not available. Such as environemnts with '
'ephemeral-heat')
opts = parser.parse_args(argv[1:])
@ -225,7 +232,8 @@ class ConvertToAnsibleJ2(object):
if isinstance(param, str):
if param in self.param_to_var_map:
return self.param_to_var_map[param]
elif param in self.stack_env.get('parameter_defaults', {}):
elif (self.stack_env and
param in self.stack_env.get('parameter_defaults', {})):
stack_value = self.stack_env['parameter_defaults'][param]
print('INFO - Custom Parameter {} was hard-coded in the '
'converted template using the value from the Heat stack '
@ -389,7 +397,7 @@ class ConvertToAnsibleJ2(object):
net_config_res_props = net_config_res['properties']
if net_config_res['type'] == 'OS::Heat::Value':
h_net_conf = net_config_res_props['value']
h_net_conf = net_config_res_props['value']['network_config']
elif net_config_res['type'] == 'OS::Heat::SoftwareConfig':
h_net_conf = net_config_res_props['config']['str_replace'][
'params']['$network_config']['network_config']
@ -501,7 +509,10 @@ def main():
j2_template = os.path.splitext(template)[0] + '.j2'
validate_files(opts, template, networks_file, j2_template)
stack_env = get_stack_environment(opts.stack)
if not opts.standalone:
stack_env = get_stack_environment(opts.stack)
else:
stack_env = None
converter = ConvertToAnsibleJ2(stack_env, networks_file)