Modify the image to Centos stream for terraform provisioning (#611)

Signed-off-by: Arthy Loganathan <[email protected]> Signed-off-by: Arthy Loganathan <[email protected]>
red-hat-data-services · Oct 31, 2022 · 2c0687f · 2c0687f
1 parent 0136af5
commit 2c0687f
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 25 deletions.
diff --git a/utils/scripts/terraform/openstack/provision.py b/utils/scripts/terraform/openstack/provision.py
@@ -131,14 +131,11 @@ def set_config(self):
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
 
-    optional_create_instance_parser = (
-        create_instance_parser._action_groups.pop())
-    required_create_instance_parser = (
-        create_instance_parser.add_argument_group(
-        "required arguments")
-    )
-    create_instance_parser._action_groups.append(
-        optional_create_instance_parser)
+    optional_create_instance_parser = create_instance_parser._action_groups.pop()
+    required_create_instance_parser = create_instance_parser.add_argument_group(
+        "required arguments"
+    )
+    create_instance_parser._action_groups.append(optional_create_instance_parser)
     required_create_instance_parser.add_argument(
         "--cloud_name",
         help="Cloud provider name",
@@ -166,7 +163,7 @@ def set_config(self):
     required_create_instance_parser.add_argument(
         "--key_pair",
         help="The public key of an OpenSSH key"
-             " pair to be used for access to created instances",
+        " pair to be used for access to created instances",
         action="store",
         dest="key_pair",
         required=True,
@@ -192,7 +189,7 @@ def set_config(self):
         action="store",
         dest="image_name",
         metavar="",
-        default="CentOS-8-x86_64-GenericCloud-released-latest",
+        default="CentOS-Stream-8-x86_64-GenericCloud",
     )
     create_instance_parser.set_defaults(func=prov_obj.create_instance)
 
@@ -203,10 +200,9 @@ def set_config(self):
         formatter_class=argparse.ArgumentDefaultsHelpFormatter,
     )
 
-    optional_delete_instance_parser = (
-        delete_instance_parser._action_groups.pop())
-    required_delete_instance_parser = (
-        delete_instance_parser.add_argument_group("required arguments")
+    optional_delete_instance_parser = delete_instance_parser._action_groups.pop()
+    required_delete_instance_parser = delete_instance_parser.add_argument_group(
+        "required arguments"
     )
     delete_instance_parser._action_groups.append(optional_delete_instance_parser)
     required_delete_instance_parser.add_argument(
@@ -217,16 +213,12 @@ def set_config(self):
         required=True,
     )
     required_delete_instance_parser.add_argument(
-        "--vm_name",
-        help="vm name",
-        action="store",
-        dest="vm_name",
-        required=True
+        "--vm_name", help="vm name", action="store", dest="vm_name", required=True
     )
     required_delete_instance_parser.add_argument(
         "--key_pair",
         help="The public key of an OpenSSH key"
-             " pair to be used for access to created instances",
+        " pair to be used for access to created instances",
         action="store",
         dest="key_pair",
         required=True,
@@ -252,7 +244,7 @@ def set_config(self):
         action="store",
         dest="image_name",
         metavar="",
-        default="CentOS-8-x86_64-GenericCloud-released-latest",
+        default="CentOS-Stream-8-x86_64-GenericCloud",
     )
     delete_instance_parser.set_defaults(func=prov_obj.delete_instance)
 

diff --git a/utils/scripts/terraform/openstack/requirements.sh b/utils/scripts/terraform/openstack/requirements.sh
@@ -1,7 +1,5 @@
+#!/bin/bash
 sudo dnf -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm
 sudo dnf install -y python3-devel git redhat-lsb jq podman dnf-plugins-core java-1.8.0-openjdk unzip chromium chromedriver
-sudo dnf config-manager --add-repo https://rpm.releases.hashicorp.com/fedora/hashicorp.repo
-sudo dnf install -y terraform
-sudo pip3 install python-terraform
 sudo pip3 install --ignore-installed pyyaml
 git config --global http.sslVerify "false"
diff --git a/utils/scripts/terraform/openstack/variables.tf b/utils/scripts/terraform/openstack/variables.tf
@@ -23,7 +23,7 @@ variable "vm_private_key" {
 variable "image_name" {
   type = string
   description = "value"
-  default = "CentOS-8-x86_64-GenericCloud-released-latest"
+  default = "CentOS-Stream-8-x86_64-GenericCloud"
 }
 
 variable "flavor_name" {