Increased retires and removed repos for el9 and added for el8 (#544)

* Added reboot Signed-off-by: Jayesh-Kumar3 <[email protected]> * added echo Signed-off-by: Jayesh-Kumar3 <[email protected]> * increased wait time Signed-off-by: Jayesh-Kumar3 <[email protected]> * Removed repos Signed-off-by: Jayesh-Kumar3 <[email protected]> * Removed reboot Signed-off-by: Jayesh-Kumar3 <[email protected]> --------- Signed-off-by: Jayesh-Kumar3 <[email protected]> Co-authored-by: Jayesh-Kumar3 <[email protected]>
IBM · Jun 12, 2024 · 069cdb2 · 069cdb2
1 parent c82808e
commit 069cdb2
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/resources/common/scripts/prepare_scale_inv_ini.py b/resources/common/scripts/prepare_scale_inv_ini.py
@@ -100,7 +100,7 @@ def prepare_ansible_playbook(hosts_config, cluster_config, cluster_key_file):
     shell: ssh {{{{ ansible_ssh_common_args }}}} -i {cluster_key_file} root@{{{{ inventory_hostname }}}} "echo PASSWDLESS_SSH_ENABLED"
     register: result
     until: result.stdout.find("PASSWDLESS_SSH_ENABLED") != -1
-    retries: 60
+    retries: 240
     delay: 10
 # Validate Scale packages existence to skip node role
 - name: Check if Scale packages already installed on node

diff --git a/resources/ibmcloud/compute/bare_metal_server_multiple_vol/bare_metal_server_multiple_vol.tf b/resources/ibmcloud/compute/bare_metal_server_multiple_vol/bare_metal_server_multiple_vol.tf
@@ -126,10 +126,6 @@ firewall-offline-cmd --zone=public --add-port=30000-61000/udp
 systemctl start firewalld
 systemctl enable firewalld
 
-if grep -q "platform:el9" /etc/os-release
-then
-    subscription-manager repos --enable=rhel-9-for-x86_64-supplementary-eus-rpms
-fi
 if [ "${var.enable_protocol}" == true ]; then
     sec_interface=$(nmcli -t con show --active | grep eth1 | cut -d ':' -f 1)
     nmcli conn del "$sec_interface"

diff --git a/resources/ibmcloud/compute/bare_metal_server_multiple_vol/cloud_init.yml b/resources/ibmcloud/compute/bare_metal_server_multiple_vol/cloud_init.yml
@@ -16,6 +16,7 @@ write_files:
               package_list="python3 kernel-devel-$(uname -r) kernel-headers-$(uname -r) firewalld numactl make gcc-c++ elfutils-libelf-devel bind-utils iptables-nft nfs-utils elfutils elfutils-devel python3-dnf-plugin-versionlock"
           elif grep -q "platform:el8" /etc/os-release
           then
+              subscription-manager repos --enable=rhel-8-for-x86_64-baseos-eus-rpms
               package_list="python38 kernel-devel-$(uname -r) kernel-headers-$(uname -r) firewalld numactl jq make gcc-c++ elfutils-libelf-devel bind-utils iptables nfs-utils elfutils elfutils-devel python3-dnf-plugin-versionlock"
           fi
 
@@ -90,10 +91,6 @@ write_files:
       systemctl start firewalld
       systemctl enable firewalld
 
-      if grep -q "platform:el9" /etc/os-release
-      then
-          subscription-manager repos --enable=rhel-9-for-x86_64-supplementary-eus-rpms
-      fi
       if [ "${enable_protocol}" == true ]; then
           sec_interface=$(nmcli -t con show --active | grep eth1 | cut -d ':' -f 1)
           nmcli conn del "$sec_interface"