Pārlūkot izejas kodu

Merge pull request #483 from abhishek-s-a/offline_repo

Issue #481: Offline repo changes for newer dsu version
John Lockman 3 gadi atpakaļ
vecāks
revīzija
e7f157248a
21 mainītis faili ar 36 papildinājumiem un 25 dzēšanām
  1. 1 1
      control_plane/roles/control_plane_repo/files/C4140_inv.xml
  2. 1 1
      control_plane/roles/control_plane_repo/files/C6420_inv.xml
  3. 1 1
      control_plane/roles/control_plane_repo/files/C6520_inv.xml
  4. 1 1
      control_plane/roles/control_plane_repo/files/R240_inv.xml
  5. 1 1
      control_plane/roles/control_plane_repo/files/R340_inv.xml
  6. 1 1
      control_plane/roles/control_plane_repo/files/R440_inv.xml
  7. 1 1
      control_plane/roles/control_plane_repo/files/R540_inv.xml
  8. 1 1
      control_plane/roles/control_plane_repo/files/R640_inv.xml
  9. 1 1
      control_plane/roles/control_plane_repo/files/R650_inv.xml
  10. 1 1
      control_plane/roles/control_plane_repo/files/R740_inv.xml
  11. 1 1
      control_plane/roles/control_plane_repo/files/R740xd2_inv.xml
  12. 1 1
      control_plane/roles/control_plane_repo/files/R740xd_inv.xml
  13. 1 1
      control_plane/roles/control_plane_repo/files/R750_inv.xml
  14. 1 1
      control_plane/roles/control_plane_repo/files/R750xa_inv.xml
  15. 1 1
      control_plane/roles/control_plane_repo/files/R840_inv.xml
  16. 1 1
      control_plane/roles/control_plane_repo/files/R940_inv.xml
  17. 1 1
      control_plane/roles/control_plane_repo/files/R940xa_inv.xml
  18. 3 2
      control_plane/roles/control_plane_repo/tasks/download_fmw_updates.yml
  19. 11 3
      control_plane/roles/control_plane_repo/tasks/install_dsu.yml
  20. 2 2
      control_plane/roles/control_plane_repo/tasks/validate_idrac_vars.yml
  21. 3 1
      control_plane/roles/control_plane_repo/vars/main.yml

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/C4140_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/C6420_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/C6520_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R240_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R340_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R440_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R540_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R640_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R650_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R740_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R740xd2_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R740xd_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R750_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R750xa_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R840_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R940_inv.xml


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 1 - 1
control_plane/roles/control_plane_repo/files/R940xa_inv.xml


+ 3 - 2
control_plane/roles/control_plane_repo/tasks/download_fmw_updates.yml

@@ -14,7 +14,8 @@
 ---
 
 - name: Downloading Firwmare Updates (This process may take few hours depending upon the poweredge_model list)
-  command: 'dsu --destination-type=REP --input-inventory-file="{{ role_path }}/files/{{ item }}_inv.xml" \
+  command: 'dsu --destination-type=REP --source-type=REPOSITORY --input-inventory-file="{{ role_path }}/files/{{ item }}_inv.xml" \
     --destination-location="{{ nfs_share_offline_repo }}" --non-interactive'
   with_items: "{{ poweredge_model.split(',') | map('trim') }}"
-  changed_when: true
+  changed_when: true
+  failed_when: false

+ 11 - 3
control_plane/roles/control_plane_repo/tasks/install_dsu.yml

@@ -29,12 +29,20 @@
 
 - name: Execute bootstrap.cgi
   shell: >
+    set -o pipefail && \
     echo "y" | bash {{ dsu_folder_dest }}/bootstrap.cgi
   changed_when: true
   register: bootstrap_execution_result
   failed_when: "'FAILED' in bootstrap_execution_result.stderr"
 
+- name: Download dell-omnia-system-update.rpm
+  get_url:
+    url: "{{ dsu_rpm_url }}"
+    dest: "{{ dsu_folder_dest }}"
+  register: dsu_rpm_result
+  until: dsu_rpm_result is not failed
+  retries: 20
+
 - name: Install DSU
-  package:
-    name: dell-system-update
-    state: present
+  command: dnf install "{{ dsu_folder_dest }}/{{ dsu_rpm_file }}" -y
+  changed_when: true

+ 2 - 2
control_plane/roles/control_plane_repo/tasks/validate_idrac_vars.yml

@@ -26,7 +26,7 @@
 
 - name: Read poweredge_model file
   command: cat {{ role_path }}/files/poweredge_models.txt
-  ignore_errors: yes
+  failed_when: false
   register: poweredge_models_file_output
   changed_when: false
 
@@ -38,4 +38,4 @@
     success_msg: "{{ poweredge_model_success_msg }}"
     fail_msg: "{{ poweredge_model_fail_msg }}"
   when: firmware_update_required
-  with_items: "{{ poweredge_model.split(',') | map('trim') }}"
+  with_items: "{{ poweredge_model.split(',') | map('trim') }}"

+ 3 - 1
control_plane/roles/control_plane_repo/vars/main.yml

@@ -25,4 +25,6 @@ poweredge_model_fail_msg: "Failed. poweredge_model is incorrect or unsupported.
 # Usage: install_dsu.yml
 dsu_folder_dest: /root/dsu
 dsu_folder_dest_mode: 0644
-bootstrap_repo_url: https://linux.dell.com/repo/hardware/dsu/bootstrap.cgi
+bootstrap_repo_url: https://linux.dell.com/repo/hardware/dsu/bootstrap.cgi
+dsu_rpm_url: https://linux.dell.com/repo/hardware/omnia/os_independent/x86_64/dell-omnia-system-update-1.9.2.1-21.08.00.x86_64.rpm
+dsu_rpm_file: dell-omnia-system-update-1.9.2.1-21.08.00.x86_64.rpm