Skip to content

baremetal: add docker_insecure_registries for metalbox to deploy play… #2265

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

Merged
berendt merged 1 commit into from
May 6, 2026
Merged

baremetal: add docker_insecure_registries for metalbox to deploy play… #2265

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
29 changes: 11 additions & 18 deletions osism/commands/baremetal.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,17 @@
import json
import yaml
from osism import settings, utils
from osism.tasks.conductor.ironic import _get_metalbox_primary_ip4
from osism.utils.ssh import cleanup_ssh_known_hosts_for_node


def _apply_metalbox_vars(play_vars, device):
metalbox_ip = _get_metalbox_primary_ip4(device)
if metalbox_ip:
play_vars["hosts_additional_entries"] = {"metalbox.osism.xyz": metalbox_ip}
play_vars["docker_insecure_registries"] = ["metalbox:5001"]


class BaremetalList(Command):
def get_parser(self, prog_name):
parser = super(BaremetalList, self).get_parser(prog_name)
Expand Down Expand Up @@ -169,7 +177,6 @@ def take_action(self, parsed_args):
setup_cloud_environment, get_openstack_connection, cleanup_cloud_environment = (
get_cloud_helpers()
)
from osism.tasks.conductor.ironic import _get_metalbox_primary_ip4
from osism.tasks.conductor.utils import deep_decrypt, get_vault

password, temp_files, original_cwd, success = setup_cloud_environment(cloud)
Expand Down Expand Up @@ -297,11 +304,7 @@ def take_action(self, parsed_args):
{"hostname_name": node.name, "hosts_type": "template"}
)
if device:
metalbox_ip = _get_metalbox_primary_ip4(device)
if metalbox_ip:
play["vars"]["hosts_additional_entries"] = {
"metalbox.osism.xyz": metalbox_ip
}
_apply_metalbox_vars(play["vars"], device)
if (
"netplan_parameters" in node.extra
and node.extra["netplan_parameters"]
Expand Down Expand Up @@ -430,7 +433,6 @@ def take_action(self, parsed_args):
get_openstack_connection,
cleanup_cloud_environment,
) = get_cloud_helpers()
from osism.tasks.conductor.ironic import _get_metalbox_primary_ip4
from osism.tasks.conductor.utils import deep_decrypt, get_vault

password, temp_files, original_cwd, success = setup_cloud_environment(cloud)
Expand Down Expand Up @@ -510,11 +512,7 @@ def take_action(self, parsed_args):
{"hostname_name": node.name, "hosts_type": "template"}
)
if device:
metalbox_ip = _get_metalbox_primary_ip4(device)
if metalbox_ip:
play["vars"]["hosts_additional_entries"] = {
"metalbox.osism.xyz": metalbox_ip
}
_apply_metalbox_vars(play["vars"], device)

# Get netplan_parameters from Ironic node extra (JSON string, needs parsing)
if (
Expand Down Expand Up @@ -561,7 +559,6 @@ def take_action(self, parsed_args):
cleanup_cloud_environment(temp_files, original_cwd)
else:
# Fetch data from NetBox (default behavior, may show newer data)
from osism.tasks.conductor.ironic import _get_metalbox_primary_ip4
from osism.tasks.conductor.utils import deep_decrypt, get_vault

# Check if NetBox connection is available
Expand Down Expand Up @@ -625,11 +622,7 @@ def take_action(self, parsed_args):
play["vars"].update(
{"hostname_name": device.name, "hosts_type": "template"}
)
metalbox_ip = _get_metalbox_primary_ip4(device)
if metalbox_ip:
play["vars"]["hosts_additional_entries"] = {
"metalbox.osism.xyz": metalbox_ip
}
_apply_metalbox_vars(play["vars"], device)

# Get netplan_parameters from NetBox custom fields (already a dict, no JSON parsing needed)
if (
Expand Down