Merge "Handle roles w/o deprecated_nic_config_name during template cleanup"
This commit is contained in:
commit
a8393fa8a4
@ -325,9 +325,10 @@ def clean_templates(base_path, role_data_path, network_data_path):
|
|||||||
delete(os.path.join(
|
delete(os.path.join(
|
||||||
nic_config_dir, sample_nic_config_dir,
|
nic_config_dir, sample_nic_config_dir,
|
||||||
'%s.yaml' % role['name'].lower()))
|
'%s.yaml' % role['name'].lower()))
|
||||||
delete(os.path.join(
|
if 'deprecated_nic_config_name' in role:
|
||||||
nic_config_dir, sample_nic_config_dir,
|
delete(os.path.join(
|
||||||
role['deprecated_nic_config_name']))
|
nic_config_dir, sample_nic_config_dir,
|
||||||
|
role['deprecated_nic_config_name']))
|
||||||
|
|
||||||
|
|
||||||
opts = parse_opts(sys.argv)
|
opts = parse_opts(sys.argv)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user