Given user choice over image.

Author: MaxBed4d

ansible/vars/defaults.yml

@@ -2,12 +2,12 @@
 src_directory: "{{ ansible_env.HOME }}/src"
 
 kayobe_config_repo: https://github.com/stackhpc/stackhpc-kayobe-config.git
-kayobe_config_version: stackhpc/{{ openstack_version | lower }}
+kayobe_config_version: "{{ openstack_version }}"
 kayobe_config_name: kayobe-config
 kayobe_config_environment: ci-multinode
 
 kayobe_repo: https://github.com/stackhpc/kayobe.git
-kayobe_version: stackhpc/{{ openstack_version | lower }}
+kayobe_version: "{{ openstack_version }}"
 kayobe_name: kayobe
 
 openstack_config_repo: https://github.com/stackhpc/openstack-config-multinode

group_vars/openstack.yml

@@ -24,8 +24,8 @@ terraform_project_path: "{{ playbook_dir }}"
 terraform_state: "{{ cluster_state | default('present') }}"
 
 # The user that should be used to SSH to the cluster hosts
-cluster_ssh_user: cloud-user
-ssh_user: cloud-user
+cluster_ssh_user: "{{ 'cloud-user' if multinode_image == 'rocky9-lvm' else 'ubuntu' }}"
+ssh_user: "{{ 'cloud-user' if multinode_image == 'rocky9-lvm' else 'ubuntu' }}"
 
 tf_files: []
   #- outputs.tf

terraform.tfvars.j2

@@ -2,28 +2,28 @@ prefix = "{{ cluster_name }}"
 
 ansible_control_vm_flavor = "general.v1.small"
 ansible_control_vm_name   = "ansible-control"
-ansible_control_disk_size = 100
+ansible_control_disk_size = 10
 
 seed_vm_flavor = "general.v1.small"
-seed_disk_size = 100
+seed_disk_size = 10
 
 multinode_flavor     = "general.v1.medium"
-multinode_image      = "rocky9-lvm"
+# multinode_image      = "rocky9-lvm"
 multinode_keypair    = "MaxMNKP"
 multinode_vm_network = "stackhpc-ipv4-geneve"
 multinode_vm_subnet  = "stackhpc-ipv4-geneve-subnet"
 compute_count        = "2"
 controller_count     = "3"
-compute_disk_size    = 100
-controller_disk_size = 100
+compute_disk_size    = 10
+controller_disk_size = 10
 
 ssh_public_key = "{{ cluster_user_ssh_public_key }}"
-ssh_user = "cloud-user"
+# ssh_user = "cloud-user"
 
 storage_count     = "3"
 storage_flavor    = "general.v1.small"
-storage_disk_size = 100
+storage_disk_size = 10
 
 deploy_wazuh       = false
 # infra_vm_flavor    = "general.v1.small"
-# infra_vm_disk_size = 100
+# infra_vm_disk_size = 10

ui-meta/multinode-infra-appliance.yml

@@ -119,20 +119,29 @@ parameters:
     description: If you wish to deploy OpenStack services in the infrastructure select this option.
     kind: "boolean"
     default: false
-    options:
-      permanent: true
+    required: false
+    immutable: true
 
   - name: openstack_version
     label: OpenStack GitHub Branch name.
     description: Please provide the OpenStack GitHub Branch name you wish to deploy.
     kind: "string"
-    required: true
+    required: false
     default: "stackhpc/yoga"
     immutable: true
+ 
+
+  - name: multinode_image
+    label: Select the OpenStack version to deploy.
+    description: Please select the OpenStack version to deploy.
+    kind: "choice"
     options:
-      live_check: >
-        "curl -s --head https://github.com/{{ openstack_version }}"
-        " | grep 'HTTP/1.1 200 OK' > /dev/null && echo '✅ Valid branch' || echo '❌ Invalid branch'"
+      choices:
+        - "Ubuntu-22.04-lvm"      
+        - "rocky9-lvm"
+    required: true
+    default: "rocky9-lvm"
+    immutable: true
 
   # - name: openstack_version
   #   label: Select the OpenStack version to deploy.