Skip to content

Commit 257fdce

Browse files
committed
Fix ssh user declaration.
1 parent f987bd8 commit 257fdce

File tree

3 files changed

+29
-13
lines changed

3 files changed

+29
-13
lines changed

terraform.tfvars.j2

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,31 @@ prefix = "{{ cluster_name }}"
22

33
ansible_control_vm_flavor = "general.v1.small"
44
ansible_control_vm_name = "ansible-control"
5-
ansible_control_disk_size = 10
5+
ansible_control_disk_size = 25
66

77
seed_vm_flavor = "general.v1.small"
8-
seed_disk_size = 10
8+
seed_disk_size = 25
99

1010
multinode_flavor = "general.v1.medium"
1111
# multinode_image = "rocky9-lvm"
12+
multinode_image = "{{ multinode_image }}"
1213
multinode_keypair = "MaxMNKP"
1314
multinode_vm_network = "stackhpc-ipv4-geneve"
1415
multinode_vm_subnet = "stackhpc-ipv4-geneve-subnet"
1516
compute_count = "2"
1617
controller_count = "3"
17-
compute_disk_size = 10
18-
controller_disk_size = 10
18+
compute_disk_size = 25
19+
controller_disk_size = 25
1920

2021
ssh_public_key = "{{ cluster_user_ssh_public_key }}"
2122
# ssh_user = "cloud-user"
23+
ssh_user = "{{ 'cloud-user' if multinode_image == 'rocky9-lvm' else 'ubuntu' }}"
24+
2225

2326
storage_count = "3"
2427
storage_flavor = "general.v1.small"
25-
storage_disk_size = 10
28+
storage_disk_size = 25
2629

2730
deploy_wazuh = false
28-
# infra_vm_flavor = "general.v1.small"
29-
# infra_vm_disk_size = 10
31+
infra_vm_flavor = "general.v1.small"
32+
infra_vm_disk_size = 25

ui-meta/multinode-infra-appliance.yml

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,20 @@ parameters:
143143
default: "rocky9-lvm"
144144
immutable: true
145145

146+
# - name: multinode_image
147+
# label: Select the OpenStack version to deploy.
148+
# description: Please select the OpenStack version to deploy.
149+
# kind: "choice"
150+
# options:
151+
# choices:
152+
# - "Ubuntu-22.04-lvm"
153+
# - "rocky9-lvm"
154+
# required: true
155+
# default: "rocky9-lvm"
156+
# immutable: true
157+
158+
159+
146160
# - name: openstack_version
147161
# label: Select the OpenStack version to deploy.
148162
# description: Please select the OpenStack version to deploy.
@@ -168,8 +182,7 @@ usage_template: |-
168182
To assess the clusters, use the following ssh commands:
169183
170184
{% if cluster.outputs.cluster_access_ip %}
171-
{% set status = "READY" %}
185+
Ansible Control Host => READY -> ssh {{ ssh_user }}@{{ cluster.outputs.cluster_access_ip }}
172186
{% else %}
173-
{% set status = "NOT READY" %}
187+
Not Available
174188
{% endif %}
175-
Ansible Control Host => {{ status|green if status == "READY" else status|red }} -> ssh {{ ssh_user }}@{{ cluster.outputs.cluster_access_ip }}

variables.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ variable "ssh_public_key" {
66
type = string
77
}
88

9-
# variable "ssh_user" {
10-
# type = string
11-
# }
9+
variable "ssh_user" {
10+
type = string
11+
}
1212

1313
variable "ansible_control_vm_name" {
1414
type = string

0 commit comments

Comments
 (0)