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

Made waitForServices a cloud specific key #465

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Made waitForServices a cloud specific key #465

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
5 changes: 4 additions & 1 deletion bibigrid/core/utility/ansible_configurator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,7 @@ def write_host_and_group_vars(configurations, providers, cluster_id, log): # py
features = set(configuration_features + worker_features)
if features:
worker_dict["features"] = features
pass_through(configuration, worker_dict, "waitForServices", "wait_for_services")
write_yaml(os.path.join(aRP.GROUP_VARS_FOLDER, group_name), worker_dict, log)
vpngtw = configuration.get("vpnInstance")
if vpngtw:
Expand All @@ -119,6 +120,7 @@ def write_host_and_group_vars(configurations, providers, cluster_id, log): # py
"fallback_on_other_image": configuration.get("fallbackOnOtherImage", False)}
if configuration.get("wireguard_peer"):
vpngtw_dict["wireguard"] = {"ip": wireguard_ip, "peer": configuration.get("wireguard_peer")}
pass_through(configuration, vpngtw_dict, "waitForServices", "wait_for_services")
write_yaml(os.path.join(aRP.HOST_VARS_FOLDER, name), vpngtw_dict, log)
else:
master = configuration["masterInstance"]
Expand All @@ -132,6 +134,7 @@ def write_host_and_group_vars(configurations, providers, cluster_id, log): # py
"fallback_on_other_image": configuration.get("fallbackOnOtherImage", False)}
if configuration.get("wireguard_peer"):
master_dict["wireguard"] = {"ip": "10.0.0.1", "peer": configuration.get("wireguard_peer")}
pass_through(configuration, master_dict, "waitForServices", "wait_for_services")
write_yaml(os.path.join(aRP.GROUP_VARS_FOLDER, "master.yml"), master_dict, log)


Expand Down Expand Up @@ -194,7 +197,7 @@ def generate_common_configuration_yaml(cidrs, configurations, cluster_id, ssh_us
master_configuration.get("zabbixConf", {}),
strategy=mergedeep.Strategy.TYPESAFE_REPLACE)

for from_key, to_key in [("waitForServices", "wait_for_services"), ("ansibleRoles", "ansible_roles"),
for from_key, to_key in [("ansibleRoles", "ansible_roles"),
("ansibleGalaxyRoles", "ansible_galaxy_roles")]:
pass_through(master_configuration, common_configuration_yaml, from_key, to_key)

Expand Down
Loading