Skip to content

Add baremetal node adoption #2166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
janhorstmann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Add baremetal node adoption #2166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions osism/commands/netbox.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ def get_parser(self, prog_name):
type=int,
help="Timeout for a scheduled task that has not been executed yet",
)
parser.add_argument(
"--adopt",
help="Adopt nodes rather than moving them to available\n"
"Note: nodes are also adopted implicitly when the NetBox"
"custom field 'provision_state' is set to 'active'.",
action="store_true",
)
parser.add_argument(
"--force",
help="Force update of baremetal nodes (Used to update non-comparable items like passwords)",
Expand Down Expand Up @@ -69,6 +76,7 @@ def take_action(self, parsed_args):

task = conductor.sync_ironic.delay(
node_name=node_name,
adopt=parsed_args.adopt,
force=parsed_args.force,
dry_run=parsed_args.dry_run,
skip_kernel_params=parsed_args.skip_kernel_params,
Expand Down
2 changes: 2 additions & 0 deletions osism/tasks/conductor/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ def sync_netbox(self, node_name=None, netbox_filter=None):
def sync_ironic(
self,
node_name=None,
adopt=False,
force=False,
dry_run=False,
skip_kernel_params=None,
Expand All @@ -65,6 +66,7 @@ def sync_ironic(
self.request.id,
get_ironic_parameters,
node_name,
adopt,
force,
dry_run,
skip_kernel_params=skip_kernel_params or [],
Expand Down
111 changes: 85 additions & 26 deletions osism/tasks/conductor/ironic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,9 @@ def _prettify_for_display(obj):
return result


def _sync_ironic_device(request_id, device, node_attributes, ports_attributes, force):
def _sync_ironic_device(
request_id, device, node_attributes, ports_attributes, adopt, force
):
osism_utils.push_task_output(request_id, f"Processing device {device.name}\n")
node = openstack.baremetal_node_show(device.name, ignore_missing=True)
if not node:
Expand Down Expand Up @@ -411,6 +413,9 @@ def _sync_ironic_device(request_id, device, node_attributes, ports_attributes, f
)
openstack.baremetal_port_delete(node_port["id"])

# NOTE: Adopt nodes with provisioning state active in NetBox or if explicitly requested
is_adoption = adopt or device.custom_fields.get("provision_state", None) == "active"

node_validation = openstack.baremetal_node_validate(node["uuid"])
if node_validation["management"].result:
osism_utils.push_task_output(
Expand All @@ -430,8 +435,8 @@ def _sync_ironic_device(request_id, device, node_attributes, ports_attributes, f
request_id,
f"Baremetal node for {device.name} is manageable\n",
)
# NOTE: Ironic keeps the power state found during enroll. We set the node power state to off in order to have a defined state for all newly synced nodes
if node["power_state"] != "power off":
if not is_adoption and node["power_state"] != "power off":
# NOTE: Ironic keeps the power state found during enroll. We set the node power state to off in order to have a defined state for all newly synced nodes
osism_utils.push_task_output(
request_id,
f"Setting power state to 'power off' for {device.name}\n",
Expand All @@ -449,40 +454,73 @@ def _sync_ironic_device(request_id, device, node_attributes, ports_attributes, f
request_id,
f"Validation of boot interface successful for baremetal node for {device.name}\n",
)
if node["provision_state"] == "manageable":
if is_adoption and node["provision_state"] == "available":
# Note: Prepare adoption of available nodes by moving them to manageable
osism_utils.push_task_output(
request_id,
f"Transitioning baremetal node to available state for {device.name}\n",
f"Prepare adoption of available baremetal node by transitioning to manageable state for {device.name}\n",
)
if node["automated_clean"]:
# NOTE: Skip automated cleaning on transition from managable to available. We are waiting for the transition and do not want to wait on cleaning at this point
node = openstack.baremetal_node_update(
node["uuid"], dict(automated_clean=False)
node = openstack.baremetal_node_set_provision_state(
node["uuid"], "manage"
)
node = openstack.baremetal_node_wait_for_nodes_provision_state(
node["uuid"], "manageable"
)
osism_utils.push_task_output(
request_id,
f"Baremetal node for {device.name} is manageable\n",
)
if node["provision_state"] == "manageable":
if is_adoption:
osism_utils.push_task_output(
request_id,
f"Adopting baremetal node for {device.name}\n",
)
try:
openstack.baremetal_node_set_boot_device(
node["uuid"], "cdrom", persistent=False
node = openstack.baremetal_node_set_provision_state(
node["uuid"], "adopt"
)
node = openstack.baremetal_node_wait_for_nodes_provision_state(
node["uuid"], "active"
)
except Exception:
osism_utils.push_task_output(
request_id,
f"Could not set boot device to cdrom for {device.name}, continuing\n",
f"Baremetal node for {device.name} is active\n",
)
node = openstack.baremetal_node_set_provision_state(
node["uuid"], "provide"
)
node = openstack.baremetal_node_wait_for_nodes_provision_state(
node["uuid"], "available"
)
else:
osism_utils.push_task_output(
request_id,
f"Transitioning baremetal node to available state for {device.name}\n",
)
if node["automated_clean"]:
# NOTE: Skip automated cleaning on transition from managable to available. We are waiting for the transition and do not want to wait on cleaning at this point
node = openstack.baremetal_node_update(
node["uuid"], dict(automated_clean=False)
)
try:
openstack.baremetal_node_set_boot_device(
node["uuid"], "cdrom", persistent=False
)
except Exception:
osism_utils.push_task_output(
request_id,
f"Could not set boot device to cdrom for {device.name}, continuing\n",
)
node = openstack.baremetal_node_set_provision_state(
node["uuid"], "provide"
)
node = openstack.baremetal_node_wait_for_nodes_provision_state(
node["uuid"], "available"
)
osism_utils.push_task_output(
request_id,
f"Baremetal node for {device.name} is available\n",
)

if not node["automated_clean"]:
# NOTE: Activate automated cleaning, so that future actions will trigger it
node = openstack.baremetal_node_update(
node["uuid"], dict(automated_clean=True)
)
osism_utils.push_task_output(
request_id,
f"Baremetal node for {device.name} is available\n",
)
else:
osism_utils.push_task_output(
request_id,
Expand Down Expand Up @@ -517,7 +555,7 @@ def _sync_ironic_device(request_id, device, node_attributes, ports_attributes, f


def _sync_ironic_device_dry_run(
request_id, device, node_attributes, ports_attributes, force, template_vars
request_id, device, node_attributes, ports_attributes, adopt, force, template_vars
):
# Collect actual secret values for string-level masking
secret_values = set()
Expand Down Expand Up @@ -553,6 +591,20 @@ def _indent_json(obj):
request_id,
f"[DRY RUN] Would CREATE port with MAC {port_attributes['address']} for {device.name}\n",
)
osism_utils.push_task_output(
request_id,
f"[DRY RUN] Would try to transition node to `manageable` for {device.name}\n",
)
if adopt or device.custom_fields["provision_state"] == "active":
osism_utils.push_task_output(
request_id,
f"[DRY RUN] Would try to adopt node for {device.name}\n",
)
else:
osism_utils.push_task_output(
request_id,
f"[DRY RUN] Would try to transition node to `available` for {device.name}\n",
)
else:
# NOTE: Check whether the baremetal node needs to be updated
node_updates = {}
Expand Down Expand Up @@ -617,6 +669,7 @@ def sync_ironic(
request_id,
get_ironic_parameters,
node_name=None,
adopt=False,
force=False,
dry_run=False,
skip_kernel_params=None,
Expand Down Expand Up @@ -773,6 +826,7 @@ def sync_ironic(
device,
node_attributes,
ports_attributes,
adopt,
force,
template_vars,
)
Expand All @@ -784,7 +838,12 @@ def sync_ironic(
if lock.acquire(timeout=120):
try:
_sync_ironic_device(
request_id, device, node_attributes, ports_attributes, force
request_id,
device,
node_attributes,
ports_attributes,
adopt,
force,
)
except Exception as exc:
osism_utils.push_task_output(
Expand Down