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.

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

Replace repo_root_path with dci_cluster_configs_dir pinned in DOA #140

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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: 1 addition & 1 deletion roles/create_cluster/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ create: True
manifests: True
schedulable_masters: True

fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

disconnected: "{{ use_local_mirror_registry | default(setup_registry_service | default(true)) }}"
mirror_registry_fqdn: "{{ hostvars['registry_host']['registry_fqdn'] | default(hostvars['registry_host']['ansible_fqdn']) }}"
Expand Down
2 changes: 1 addition & 1 deletion roles/create_day2_cluster/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@ manifest_templates:
- 50-worker-nm-fix-ipv6.yml
- 50-worker-remove-ipi-leftovers.yml

fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"
day2_cluster_id_filename: day2_cluster.txt # This default is for backwards compatibility
2 changes: 1 addition & 1 deletion roles/display_deployment_plan/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
groups_missing: "<no groups set>"
kubeadmin_vault_password_file_path_missing: "UNDEFINED (This means the kubeadmin credentals will be stored in plain text)"
pxe_hosts_missing: "[WARNING] No hosts are set"
cached_image_hash_file_path: "{{ image_hashes_path | default(repo_root_path + '/image_hashes.yml') }}"
cached_image_hash_file_path: "{{ image_hashes_path | default(repo_root_path | default(dci_cluster_configs_dir) + '/image_hashes.yml') }}"

# A default error message is assigned to each variable referenced in the deployment plan.
# This prevents the prompt from not being displayed due to templating errors if a valid
Expand Down
2 changes: 1 addition & 1 deletion roles/generate_agent_iso/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
generated_dir: "{{ repo_root_path }}/generated"
generated_dir: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/generated"
manifests_dir: "{{ generated_dir }}/{{ cluster_name }}"
download_agent_dest_file: "{{ discovery_iso_name }}"
download_dest_path: "{{ iso_download_dest_path | default('/opt/http_store/data') }}"
Expand Down
4 changes: 2 additions & 2 deletions roles/generate_manifests/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
generated_dir: "{{ repo_root_path }}/generated"
generated_dir: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/generated"
manifests_dir: "{{ generated_dir }}/{{ cluster_name }}"
cluster_manifest_dir: "{{ manifests_dir }}/cluster-manifests"
extra_manifest_dir: "{{ manifests_dir }}/openshift"
Expand All @@ -24,7 +24,7 @@ manifests: true
extra_manifests: []
manifest_templates: "{{ extra_manifests }}"

fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

api_vips: "{% if extra_api_vip is defined %}{{ [api_vip] + [extra_api_vip] }}{% else %}{{ [api_vip] }}{% endif %}"
ingress_vips: "{% if extra_ingress_vip is defined %}{{ [ingress_vip] + [extra_ingress_vip] }}{% else %}{{ [ingress_vip] }}{% endif %}"
Expand Down
2 changes: 1 addition & 1 deletion roles/generate_ssh_key_pair/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@ public_key_name: "{{ cluster_name }}.pub"
path_base_dir: /home/redhat
ssh_key_dest_base_dir: "{{ path_base_dir }}"
ssh_key_dest_dir: "{{ ssh_key_dest_base_dir }}/ssh_keys/"
fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"
2 changes: 1 addition & 1 deletion roles/get_image_hash/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ destination_hosts:
- registry_host
- assisted_installer

image_hashes_path: "{{ repo_root_path }}/image_hashes.yml"
image_hashes_path: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/image_hashes.yml"
ignore_cached_image_hashes: false
image_hashes: {}

Expand Down
2 changes: 1 addition & 1 deletion roles/install_cluster/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ URL_ASSISTED_INSTALLER_CLUSTER: "{{ ASSISTED_INSTALLER_BASE_URL }}/clusters/{{ c
HTTP_AUTH_USERNAME: "none"
HTTP_AUTH_PASSWORD: "none"

fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

single_node_openshift_enabled: "{{ is_valid_single_node_openshift_config | default(false) }}"

Expand Down
4 changes: 2 additions & 2 deletions roles/monitor_agent_based_installer/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
generated_dir: "{{ repo_root_path }}/generated"
manifests_dir: "{{ generated_dir}}/{{ cluster_name }}"
generated_dir: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/generated"
manifests_dir: "{{ generated_dir }}/{{ cluster_name }}"

agent_based_installer_bootstrap_node: "{{ groups['masters'][0] }}"
host_ip_keyword: ansible_host
4 changes: 2 additions & 2 deletions roles/monitor_agent_based_installer/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@

rescue:
# Using master-0 IP address to reach the bootstrap VM
# Placing the logs in repo_root_path
# Placing the logs in repo_root_path aka dci_cluster_configs_dir
# Trying several times in case there are SSH connectivity issues
- name: Gather logs from installation
vars:
rendezvous_ip_address: "{{ hostvars[agent_based_installer_bootstrap_node][host_ip_keyword] }}"
ansible.builtin.shell:
cmd: "{{ agent_based_installer_path }} --log-level=debug gather bootstrap --bootstrap {{ rendezvous_ip_address }}"
chdir: "{{ repo_root_path }}"
chdir: "{{ repo_root_path | default(dci_cluster_configs_dir) }}"
register: command_result
until: command_result.rc == 0
retries: 6
Expand Down
2 changes: 1 addition & 1 deletion roles/patch_cluster/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ patch_set_prefix: ""

secure: False
manifests: True
fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

disconnected: "{{ use_local_mirror_registry | default(setup_registry_service | default(true)) }}"

Expand Down
2 changes: 1 addition & 1 deletion roles/populate_mirror_registry/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# Paths
config_file_path: "{{ ansible_env.HOME }}" # Where config and secret files should be stored
fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

# defaults file for disconnected_registry
pull_secret_file_name: pull-secret.txt
Expand Down
2 changes: 1 addition & 1 deletion roles/post_install/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ dest_dir: "{{ kubeconfig_dest_dir | default(ansible_env.HOME) }}"
kubeconfig_path: "{{ dest_dir }}/{{ kube_filename }}"
kubeadmin_vault_name: "{{ kubeadmin_dest_filename | default(cluster_name + '-kubeadmin.vault.yml') }}"
domain: "{{ cluster_name }}.{{ base_dns_domain }}"
generated_dir: "{{ repo_root_path }}/generated"
generated_dir: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/generated"
manifests_dir: "{{ generated_dir }}/{{ cluster_name }}"
auth_dir: "{{ manifests_dir }}/auth"
2 changes: 1 addition & 1 deletion roles/setup_mirror_registry/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ registry_container_image: quay.io/redhat-partner-solutions/registry:2

# Paths
config_file_path: "{{ ansible_env.HOME }}" # Where config and secret files should be stored
fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

# vars file for disconnected_registry
# packages needed for the disconnected registry tasks
Expand Down
2 changes: 1 addition & 1 deletion roles/setup_selfsigned_cert/defaults/main.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
host_var_key: "registry_host"
fetched_dest: "{{ repo_root_path }}/fetched"
fetched_dest: "{{ repo_root_path | default(dci_cluster_configs_dir) }}/fetched"

# Directory to be created
registry_dir: /opt/registry
Expand Down