Skip to content

Commit 9970a78

Browse files
authored
Rename --force-update parameter to --force for sync ironic command (#1841)
Simplifies the CLI interface by shortening the parameter name from --force-update to --force. This change affects: - CLI argument definition in osism/commands/netbox.py - Task parameter in osism/tasks/conductor/__init__.py - Function parameter in osism/tasks/conductor/ironic.py The functionality remains unchanged - the parameter still forces updates of baremetal nodes for non-comparable items like passwords. AI-assisted: Claude Code Signed-off-by: Christian Berendt <berendt@osism.tech>
1 parent 956647f commit 9970a78

3 files changed

Lines changed: 6 additions & 8 deletions

File tree

osism/commands/netbox.py

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ def get_parser(self, prog_name):
3333
help="Timeout for a scheduled task that has not been executed yet",
3434
)
3535
parser.add_argument(
36-
"--force-update",
36+
"--force",
3737
help="Force update of baremetal nodes (Used to update non-comparable items like passwords)",
3838
action="store_true",
3939
)
@@ -47,9 +47,7 @@ def take_action(self, parsed_args):
4747
task_timeout = parsed_args.task_timeout
4848
node_name = parsed_args.node
4949

50-
task = conductor.sync_ironic.delay(
51-
node_name=node_name, force_update=parsed_args.force_update
52-
)
50+
task = conductor.sync_ironic.delay(node_name=node_name, force=parsed_args.force)
5351
if wait:
5452
if node_name:
5553
logger.info(

osism/tasks/conductor/__init__.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ def sync_netbox(self, node_name=None, netbox_filter=None):
4949

5050

5151
@app.task(bind=True, name="osism.tasks.conductor.sync_ironic")
52-
def sync_ironic(self, node_name=None, force_update=False):
52+
def sync_ironic(self, node_name=None, force=False):
5353
# Check if tasks are locked before execution
5454
utils.check_task_lock_and_exit()
5555

56-
_sync_ironic(self.request.id, get_ironic_parameters, node_name, force_update)
56+
_sync_ironic(self.request.id, get_ironic_parameters, node_name, force)
5757

5858

5959
@app.task(bind=True, name="osism.tasks.conductor.sync_sonic")

osism/tasks/conductor/ironic.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ def _prepare_node_attributes(device, get_ironic_parameters):
134134
return node_attributes
135135

136136

137-
def sync_ironic(request_id, get_ironic_parameters, node_name=None, force_update=False):
137+
def sync_ironic(request_id, get_ironic_parameters, node_name=None, force=False):
138138
if node_name:
139139
osism_utils.push_task_output(
140140
request_id,
@@ -276,7 +276,7 @@ def sync_ironic(request_id, get_ironic_parameters, node_name=None, force_update=
276276
node_updates["driver_info"].pop(password_key, None)
277277
if not node_updates["driver_info"]:
278278
node_updates.pop("driver_info", None)
279-
if node_updates or force_update:
279+
if node_updates or force:
280280
osism_utils.push_task_output(
281281
request_id,
282282
f"Updating baremetal node for {device.name} with {node_updates}\n",

0 commit comments

Comments
 (0)