Skip to content
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

[6.13.z]Update Provisioning workflow names #16168

Merged
merged 1 commit into from
Aug 30, 2024
+7 −5
Merged

[6.13.z]Update Provisioning workflow names #16168

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
2 changes: 2 additions & 0 deletions conf/provisioning.yaml.template
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,5 @@ PROVISIONING:
HOST_ROOT_PASSWORD:
HOST_SSH_KEY_PRIV:
HOST_SSH_KEY_PUB:
PROVISIONING_SAT_WORKFLOW:
PROVISIONING_HOST_WORKFLOW:
2 changes: 1 addition & 1 deletion pytest_fixtures/component/provision_capsule_pxe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ def capsule_provisioning_sat(
sat = module_target_sat
provisioning_domain_name = f"{gen_string('alpha').lower()}.foo"
broker_data_out = Broker().execute(
workflow='configure-install-sat-provisioning-rhv',
workflow=settings.provisioning.provisioning_sat_workflow,
artifacts='last',
target_vlan_id=settings.provisioning.vlan_id,
target_host=module_capsule_configured.name,
Expand Down
8 changes: 4 additions & 4 deletions pytest_fixtures/component/provision_pxe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ def module_provisioning_sat(
provisioning_domain_name = f"{gen_string('alpha').lower()}.foo"

broker_data_out = Broker().execute(
workflow="configure-install-sat-provisioning-rhv",
artifacts="last",
workflow=settings.provisioning.provisioning_sat_workflow,
artifacts='last',
target_vlan_id=settings.provisioning.vlan_id,
target_host=sat.name,
provisioning_dns_zone=provisioning_domain_name,
Expand Down Expand Up @@ -217,7 +217,7 @@ def provisioning_host(module_ssh_key_file, pxe_loader):
"" # TODO: Make this an optional fixture parameter (update vm_firmware when adding this)
)
with Broker(
workflow="deploy-configure-pxe-provisioning-host-rhv",
workflow=settings.provisioning.provisioning_host_workflow,
host_class=ContentHost,
target_vlan_id=vlan_id,
target_vm_firmware=pxe_loader.vm_firmware,
Expand All @@ -239,7 +239,7 @@ def provision_multiple_hosts(module_ssh_key_file, pxe_loader, request):
"" # TODO: Make this an optional fixture parameter (update vm_firmware when adding this)
)
with Broker(
workflow="deploy-configure-pxe-provisioning-host-rhv",
workflow=settings.provisioning.provisioning_host_workflow,
host_class=ContentHost,
_count=getattr(request, 'param', 2),
target_vlan_id=vlan_id,
Expand Down
Loading