[multiple] Consolidate cifmw_default_dns_servers var to group_vars

Move the definition of dns_servers used in reproducer and libvirt_manager role to common group_var definition so that it can be easily changed and managed from group_vars.

Signed-off-by: Amartya Sinha <[email protected]>

Author: amartyasinha

group_vars/all.yml

@@ -13,3 +13,8 @@ cifmw_architecture_repo: "{{ ansible_user_dir }}/{{ cifmw_architecture_repo_rela
 
 cifmw_openstack_namespace: "{{ cifmw_install_yamls_defaults['NAMESPACE'] | default('openstack') }}"
 operator_namespace: "{{ cifmw_install_yamls_defaults['OPERATOR_NAMESPACE'] | default('openstack-operators') }}"
+
+# Default DNS servers to use across the framework
+cifmw_default_dns_servers:
+  - "1.1.1.1"
+  - "8.8.8.8"

roles/libvirt_manager/README.md

@@ -211,7 +211,9 @@ The parameters listed here are therefore merely proxies to the ones set in the r
 and have the same name, less the role prefix. Default values are the same as the
 reproducer role.
 
-* `cifmw_libvirt_manager_dns_servers`: `{{ cifmw_reproducer_dns_servers | default(['1.1.1.1', '8.8.8.8']) }}`
+Now, cifmw_default_dns_servers group_vars is introduced, and it sets dns_servers for both reproducer and libvirt_manager roles.
+
+* `cifmw_libvirt_manager_dns_servers`: `{{ cifmw_default_dns_servers | default(['1.1.1.1', '8.8.8.8']) }}`
 
 ## Calling attach_network.yml from another role
 

roles/libvirt_manager/defaults/main.yml

@@ -59,9 +59,8 @@ cifmw_libvirt_manager_apply_virtproxy_patch: true
 cifmw_libvirt_manager_net_prefix_add: true
 cifmw_libvirt_manager_pub_net: public
 
-# Those parameters are usually set via the reproducer role.
-# We will therefore use them, and default to the same value set in the role.
-cifmw_libvirt_manager_dns_servers: "{{ cifmw_reproducer_dns_servers | default(['1.1.1.1', '8.8.8.8']) }}"
+# Now, cifmw_default_dns_servers group_vars is introduced, and it sets dns_servers for both reproducer and libvirt_manager roles.
+cifmw_libvirt_manager_dns_servers: "{{ cifmw_default_dns_servers | default(['1.1.1.1', '8.8.8.8']) }}"
 cifmw_libvirt_manager_crc_private_nic: "{{ cifmw_reproducer_crc_private_nic | default('enp2s0') }}"
 
 # Allow to inject custom node family

roles/reproducer/README.md

@@ -18,7 +18,7 @@ None
 * `cifmw_reproducer_run_job`: (Bool) Run actual CI job. Defaults to `true`.
 * `cifmw_reproducer_run_content_provider`: (Bool) Run content-provider job. Defaults to `true`.
 * `cifmw_reproducer_params`: (Dict) Specific parameters you want to pass to the reproducer. Defaults to `{}`.
-* `cifmw_reproducer_dns_servers`: List of dns servers which should be used by the CRC VM as upstream dns servers. Defaults to 1.1.1.1, 8.8.8.8.
+* `cifmw_reproducer_dns_servers`: List of dns servers which should be used by the CRC VM as upstream dns servers. Reads from group_var `{{ cifmw_default_dns_servers }}`. Defaults to 1.1.1.1, 8.8.8.8.
 * `cifmw_reproducer_hp_rhos_release`: (Bool) Allows to consume rhos-release on the hypervisor. Defaults to `false`.
 * `cifmw_reproducer_dnf_tweaks`: (List) Options you want to inject in dnf.conf, both on controller-0 and hypervisor. Defaults to `[]`.
 * `cifmw_reproducer_skip_fetch_repositories`: (Bool) Skip fetching repositories from zuul var and simply copy the code from the ansible controller. Defaults to `false`.

roles/reproducer/defaults/main.yml

@@ -26,9 +26,7 @@ cifmw_reproducer_kubecfg: "{{ cifmw_libvirt_manager_configuration.vms.crc.image_
 cifmw_reproducer_params: {}
 cifmw_reproducer_run_job: true
 cifmw_reproducer_run_content_provider: true
-cifmw_reproducer_dns_servers:
-  - 1.1.1.1
-  - 8.8.8.8
+cifmw_reproducer_dns_servers: "{{ cifmw_default_dns_servers | default(['1.1.1.1', '8.8.8.8']) }}"
 cifmw_reproducer_repositories: []
 cifmw_reproducer_hp_rhos_release: false
 cifmw_reproducer_dnf_tweaks: []