OpenShift Client issue has been resolved along with DNS issue (#367)

This is pull request is having fix for below two issue (ABI Disconnected) [OpenShift Client in not getting download from file_server ](#366) [ABI: On fresh z/VM bastion ABI playbook is not installing tessia base lib](#365) --------- Signed-off-by: Sumit Solanki <[email protected]> Co-authored-by: Sumit Solanki <[email protected]>
IBM · Dec 18, 2024 · 0c8d000 · 0c8d000
1 parent ef1d8c7
commit 0c8d000
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 2 deletions.
diff --git a/roles/disconnected_mirror_images/tasks/main.yaml b/roles/disconnected_mirror_images/tasks/main.yaml
@@ -2,6 +2,13 @@
 - name: mirror artifacts in disconnected mode
   tags: mirror_artifacts
   block:
+    - name: Setting Up nameserver on mirror host to resolve DNS
+      ansible.builtin.template:
+        src: resolv.conf.j2
+        dest: /etc/resolv.conf
+        owner: root
+        group: root
+        mode: "644"
     - name: Get user home directory
       tags: mirror_artifacts
       shell: >

diff --git a/roles/disconnected_mirror_images/templates/resolv.conf.j2 b/roles/disconnected_mirror_images/templates/resolv.conf.j2
@@ -0,0 +1,3 @@
+search {{ env.cluster.networking.base_domain }}
+nameserver {{ env.bastion.networking.nameserver1 }}
+{{ ('nameserver ' + env.bastion.networking.nameserver2) if env.bastion.networking.nameserver2 is defined else '' }}
diff --git a/roles/dns/templates/dns.db.j2 b/roles/dns/templates/dns.db.j2
@@ -32,7 +32,7 @@ apps.{{ env.cluster.networking.metadata_name }}  IN    CNAME {{ env.bastion.netw
 
 {% if disconnected.enabled %}
 ;entry for mirror host.
-{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}. IN A {{ env.file_server.ip }}
+{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.metadata_name }}.{{ env.cluster.networking.base_domain }}. IN A {{ disconnected.mirroring.host.ip }}
 {% endif %}
 
 ;EOF
diff --git a/roles/offline_artifacts/tasks/main.yaml b/roles/offline_artifacts/tasks/main.yaml
@@ -25,7 +25,7 @@
         remote_src: yes
       loop:
         - "{{ env.file_server.protocol }}://{{ env.file_server.user + ':' + env.file_server.pass + '@' if env.file_server.protocol == 'ftp' else '' }}{{ env.file_server.ip }}{{ ':' + env.file_server.port if env.file_server.port | default('') | length > 0 else '' }}/{{ disconnected.mirroring.file_server.clients_dir }}/{{ disconnected.mirroring.file_server.oc_mirror_tgz }}"
-        - "{{ env.file_server.protocol }}://{{ env.file_server.user + ':' + env.file_server.pass + '@' if env.file_server.protocol == 'ftp' else '' }}{{ env.file_server.ip }}{{ ':' + env.file_server.port if env.file_server.port | default('') | length > 0 else '' }}/{{ disconnected.mirroring.file_server.clients_dir }}/{{ disconnected.mirroring.client_download.ocp_client_tgz }}"
+        - "{{ disconnected.mirroring.client_download.ocp_download_url }}{{ disconnected.mirroring.client_download.ocp_client_tgz }}"
 
     - name: Copy kubectl, oc, and oc-mirror binaries to /usr/local/sbin  
       become: true