Merge pull request #2137 from abhishek-sa1/xcat

Issue #2136: Rocky 8.x upgrade warning message fix
dell · Aug 2, 2023 · 7504bf9 · 7504bf9
2 parents 3ffac5a + 4ae5f82
commit 7504bf9
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 1 deletion.
diff --git a/input/provision_config.yml b/input/provision_config.yml
@@ -42,6 +42,7 @@ discovery_mechanism: "mapping"
 #### Mandatory, discovery_mechanism: mapping or switch_based or bmc or snmpwalk
 # This is the operating system image that will be used for provisioning compute nodes in the cluster.
 # Accepted values: rocky, rhel
+# Note: When provision_os is rocky, Rocky Linux OS version on the cluster will be upgraded to the latest 8.x version available irrespective of provision_os_version provided
 # Default value: "rhel"
 provision_os: "rhel"
 

diff --git a/provision/roles/provision_validation/tasks/validate_provision_vars.yml b/provision/roles/provision_validation/tasks/validate_provision_vars.yml
@@ -69,6 +69,12 @@
     success_msg: "{{ provision_os_success_msg }}"
     fail_msg: "{{ provision_os_fail_msg }}"
 
+- name: Warning - Rocky version will be updated to latest
+  ansible.builtin.pause:
+    seconds: "{{ warning_wait_time_repo }}"
+    prompt: "{{ rocky_update_warning_msg }}"
+  when: provision_os | lower == os_supported_rocky
+
 - name: Verify the iso_file_path
   ansible.builtin.stat:
     path: "{{ iso_file_path }}"

diff --git a/provision/roles/provision_validation/vars/main.yml b/provision/roles/provision_validation/vars/main.yml
@@ -172,7 +172,9 @@ desired_capacity_success_msg: "desired_capacity of disk_partition successfully v
 desired_capacity_fail_msg: "Failed. Provide valid integer value to desired_capacity of disk_partition"
 supported_rhel_os_version: ["8.0", "8.1", "8.2", "8.3", "8.4", "8.5", "8.6", "8.7", "8.8", "8.9"]
 provision_os_version_fail_msg: "Failed. Invalid provision_os_version: {{ provision_os_version }} provided in provision_config.yml.
-Supported provision_os_version values are 8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7"
+Supported provision_os_version values are 8.0,8.1,8.2,8.3,8.4,8.5,8.6,8.7,8.8"
+rocky_update_warning_msg: "[WARNING] Rocky Linux OS version on the cluster will be upgraded to the latest 8.x irrespective of provision_os_version
+provided in provision_config.yml"
 
 # Usage: validate_domain_name.yml
 domain_name_success_msg: "domain_name successfully validated"