starlingx
/
config
Code Issues Proposed changes

Merge "Improve PTP phc2sys cmdline_opts handling"

This commit is contained in:
Zuul 2023-12-01 17:20:22 +00:00 committed by Gerrit Code Review
parent 01e8b85cf9 4ce5e25665
commit a57547518a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sysinv/sysinv/sysinv/sysinv/puppet/networking.py
View File

@ -330,7 +330,11 @@ class NetworkingPuppet(base.BasePuppet):
else:
instance['device_parameters'][global_param['name']] = global_param['value']
if 'cmdline_opts' in instance['global_parameters']:
instance['cmdline_opts'] = instance['global_parameters'].pop('cmdline_opts')
cmdline = instance['global_parameters'].pop('cmdline_opts')
quotes = {"'", "\\'", '"', '\\"'}
for quote in quotes:
cmdline = cmdline.strip(quote)
instance['cmdline_opts'] = cmdline
# Prune phc2sys_ha parameters if phc2sys_ha is not enabled
if instance['service'] == constants.PTP_INSTANCE_TYPE_PHC2SYS: