verify interfaces based on backup metadata not answers

.ansible-lint

@@ -11,5 +11,4 @@ warn_list:
 enable_list:
   - only-builtins
 only_builtins_allow_modules:
-  - get_value_from_yaml_in_tarball
   - parse_backup_metadata

roles/satellite-clone/library/parse_backup_metadata.py

@@ -49,6 +49,7 @@ def parse_backup_metadata(params):
     qpidd_present = bool(find_rpm(rpms, "^qpid-cpp-server-[\d+].*"))
 
     hostname = data['hostname']
+    proxy_config = data['proxy_config']
 
     if not satellite_version:
         satellite_version = os.getenv('SATELLITE_CLONE_FORCE_VERSION')
@@ -63,6 +64,7 @@ def parse_backup_metadata(params):
                   puppetserver_present=puppetserver_present,
                   qpidd_present=qpidd_present,
                   hostname=hostname,
+                  proxy_config=proxy_config,
                   msg=msg,
                   changed=False)
     return True, result

roles/satellite-clone/tasks/backup_satellite_version_check.yml

@@ -22,6 +22,7 @@
     puppetserver_present: "{{ backup_metadata.puppetserver_present }}"
     qpidd_present: "{{ backup_metadata.qpidd_present }}"
     hostname: "{{ backup_metadata.hostname }}"
+    proxy_config: "{{ backup_metadata.proxy_config }}"
   when:
     - clone_metadata_exists
     - backup_metadata is defined

roles/satellite-clone/tasks/interface_check.yml

@@ -1,55 +1,18 @@
 ---
-- name: get answers file path from yaml
-  get_value_from_yaml_in_tarball:
-    tarball: "{{ config_files_path }}"
-    target_file: "etc/foreman-installer/scenarios.d/{{ satellite_scenario }}.yaml"
-    keys: [":answer_file"]
-  register: answer_file
-
-- name: set answers file path
-  set_fact:
-    satellite_answers_path: "{{ answer_file.value | relpath('/') }}"
-
-- name: Check if DNS is enabled
-  get_value_from_yaml_in_tarball:
-    tarball: "{{ config_files_path }}"
-    target_file: "{{ satellite_answers_path }}"
-    keys: ["foreman_proxy", "dns"]
-  register: dns_enabled
-
-- name: Check if DHCP is enabled
-  get_value_from_yaml_in_tarball:
-    tarball: "{{ config_files_path }}"
-    target_file: "{{ satellite_answers_path }}"
-    keys: ["foreman_proxy", "dhcp"]
-  register: dhcp_enabled
-
-- name: Grab DNS interface from Satellite answer file
-  get_value_from_yaml_in_tarball:
-    tarball: "{{ config_files_path }}"
-    target_file: "{{ satellite_answers_path }}"
-    keys: ["foreman_proxy", "dns_interface"]
-  register: dns_interface
-  when: dns_enabled.value
-
-- name: Grab DHCP interface from Satellite answer file
-  get_value_from_yaml_in_tarball:
-    tarball: "{{ config_files_path }}"
-    target_file: "{{ satellite_answers_path }}"
-    keys: ["foreman_proxy", "dhcp_interface"]
-  register: dhcp_interface
-  when: dhcp_enabled.value
-
-- name: Grab network interfaces from system
-  debug:
-    msg: "{{ ansible_interfaces | reject('match', 'lo') | list }}"
-  register: network_interfaces
+- name: Fail if interfaces on machine do not match backup metadata DNS interfaces
+  fail:
+    msg: "The network interface {{ proxy_config.dns_interface }} setup for DNS do not match the network interfaces on the current machine"
+  when:
+    - proxy_config.dns
+    - proxy_config.dns_interface not in network_interfaces
+  vars:
+    network_interfaces: "{{ ansible_interfaces | reject('match', 'lo') | list }}"
 
-- name: Fail if interfaces on machine do not match answer file interfaces
+- name: Fail if interfaces on machine do not match backup metadata DHCP interfaces
   fail:
-    msg: "The network interface {{ dns_interface.value }} setup for DNS and {{ dhcp_interface.value }} setup for DHCP do not match the network interfaces on the current machine"
+    msg: "The network interface {{ proxy_config.dhcp_interface }} setup for DHCP do not match the network interfaces on the current machine"
   when:
-    - dns_enabled.value
-    - dhcp_enabled.value
-    - dns_interface.value not in network_interfaces.msg
-    - dhcp_interface.value not in network_interfaces.msg
+    - proxy_config.dhcp
+    - proxy_config.dhcp_interface not in network_interfaces
+  vars:
+    network_interfaces: "{{ ansible_interfaces | reject('match', 'lo') | list }}"

roles/satellite-clone/tasks/main.yml

@@ -3,13 +3,13 @@
   include_tasks: pre_install_check.yml
   when: run_pre_install_check
 
+- name: Run backup version check
+  include_tasks: backup_satellite_version_check.yml
+
 - name: Run interface check
   include_tasks: interface_check.yml
   when: run_pre_install_check and check_networking_interfaces
 
-- name: Run backup version check
-  include_tasks: backup_satellite_version_check.yml
-
 - name: Run backup check
   include_tasks: backup_check.yml