Infrastructure-Deployment by MaxBed4d · Pull Request #43 · stackhpc/terraform-kayobe-multinode

MaxBed4d · 2024-01-26T14:39:45Z

The basic changes needed to be able to deploy just the infrastructure of the multinode.

…used on infrastructure deployment.

Alex-Welsh · 2024-01-26T17:58:34Z

Is this ready for review or do you want some more time to work on it?

markgoddard

The main thing to consider here is ensuring that people can continue to use this manually, without Azimuth. Whether that's using the new cluster_infra role or continuing to run TF manually.

markgoddard · 2024-01-29T15:47:43Z

@@ -0,0 +1,11 @@
+[defaults]


I'd be interested to know what in here was actually necessary.

markgoddard · 2024-01-29T15:50:53Z


 kayobe_config_repo: https://github.com/stackhpc/stackhpc-kayobe-config.git
-kayobe_config_version: stackhpc/yoga
+kayobe_config_version: "{{ openstack_version }}"


We need to consider non-azimuth users here who will not have this variable defined. The openstack_version variable name is also less accurate than kayobe_config_version, so I suggest you switch azimuth to use kayobe_config_version.

markgoddard · 2024-01-29T15:52:13Z


 kayobe_repo: https://github.com/stackhpc/kayobe.git
-kayobe_version: stackhpc/yoga
+kayobe_version: "{{ openstack_version }}"


The kayobe branch won't necessarily be the same as kayobe_config_version.

This change has been removed and made in the Multinode-Deployment-App and is a more appropriately named variable.

markgoddard · 2024-01-29T15:52:46Z

 resource "openstack_compute_keypair_v2" "keypair" {
  name       = var.multinode_keypair
-  public_key = file(var.ssh_public_key)
+  public_key = var.ssh_public_key


This will impact other multinode users. Could we instead write out the key to a file before getting here?

markgoddard · 2024-01-29T15:58:45Z

+# Import the playbook to start configuring the multi-node hosts.
+- name: Configure hosts and deploy ansible
+  import_playbook: ansible/configure-hosts.yml   
+  when: openstack_deploy == true


We should do this unconditionally

Does this matter even when just deploying the VMs?
I am pretty sure that if we were to enable this for just the infrastructure, it would create issues for deploying OpenStack on the system, as an Azimuth patch, at a later date due to the changes made by some of the playbooks called within configure-hosts.yml. This step is partially responsible for the idempotency issue.

markgoddard · 2024-01-31T10:38:37Z

+    required: false
+    immutable: true
+
+  - name: kayobe_version_branch


I don't see this variable used anywhere.

Suggested change

- name: kayobe_version_branch

- name: kayobe_branch

There is a related issue here, which is that in deploy-openstack.sh we will install whatever version of kayobe is referenced in SKC's requirements.txt, so this input (and the ansible variable it maps to is not really being used).

It might be better to make a separate change to stop installing kayobe from source, and always install it from SKC requirements.txt.

I don't see this variable used anywhere.

These variables are used in the full multinode deployment version of the App (Multinode-Deployment-App) and those changes are not included in this version due to relating to the deployment of OpenStack on the multinode, rather than just the infrastructure.

There is a related issue here, which is that in deploy-openstack.sh we will install whatever version of kayobe is referenced in SKC's requirements.txt, so this input (and the ansible variable it maps to is not really being used).

If they aren't really being used, can we remove them all together in /ansible/vars/defaults.yml?

markgoddard · 2024-01-31T10:39:16Z

+  - name: kayobe_version_branch
+    label: Kayobe GitHub Branch.
+    description: |
+      Please provide the OpenStack GitHub Branch name you wish to deploy.


Suggested change

Please provide the OpenStack GitHub Branch name you wish to deploy.

Please provide the Kayobe GitHub Branch name you wish to deploy.

markgoddard · 2024-01-31T10:39:35Z

+  - name: kayobe_config_branch
+    label: Kayobe configuration GitHub Branch.
+    description: |
+      Please provide the GitHub Branch with the OpenStack configuration you wish to deploy.


Suggested change

Please provide the GitHub Branch with the OpenStack configuration you wish to deploy.

Please provide the StackHPC Kayobe Configuration GitHub Branch you wish to deploy.

markgoddard · 2024-01-31T10:41:04Z

+      - rocky9-lvm
+    kind: "string"
+    required: true
+    default: "rocky9-lvm"


Suggested change

- rocky9-lvm

kind: "string"

required: true

default: "rocky9-lvm"

- Rocky9-lvm

kind: "string"

required: true

default: "Rocky9-lvm"

Needs to be spelled as such to be able to call the image. Isn't the image name case-sensitive?

There isn't a lowercase Rocky 9 lvm image in SMS:

$ openstack image list --all -c Name -f value | grep -i rocky9-lvm Rocky9-lvm Rocky9-lvm-06092022 Rocky9-lvm-2022-11-08 Rocky9-lvm-20221107 Rocky9-lvm-rc Rocky9-lvm.2023-03-20

markgoddard · 2024-01-31T10:41:33Z

+      - cloud_user (rocky9-lvm)
+    kind: "string"
+    required: true
+    default: "cloud_user"


Suggested change

- cloud_user (rocky9-lvm)

kind: "string"

required: true

default: "cloud_user"

- cloud-user (Rocky9-lvm)

kind: "string"

required: true

default: "cloud-user"

Applied the default change and want to keep the comment about the image consistent.

…pc/terraform-kayobe-multinode into Infrastructure-Deployment

…her than a default.

Update description. Co-authored-by: Mark Goddard <mark@stackhpc.com>

Update App Label. Co-authored-by: Mark Goddard <mark@stackhpc.com>

…pc/terraform-kayobe-multinode into Infrastructure-Deployment

MaxBed4d added 30 commits January 3, 2024 14:50

Additions to enable Azimuth appliance support.

645e3a2

Small typo amendment.

5b8bd80

Updated usage template for multinode appliance.

18e5d28

Added 'roles' path to ansible.cfg.

7bb2cd9

Moved ansible.cfg to repo root directory.

e97a5bd

Added a requirements yaml file to repo root.

d4f9786

Roles directory typo fix in config.

0fec8b3

Changed ansible collection version.

644d46f

Added symlink of requirements.

93a2a2f

Deleted link to create one after.

b15ebf1

Symlink added.

0921854

Added Group Vars to maybe fix the inability to find roles.

fd1e533

Change roles directory name.

baa2521

Added templates so that gateway_ips can be provided.

2f36b84

Changed few tf files and 'template' to submit correct data.

c29c28c

Trying to copy all tf files to the appropriate location.

63c8f54

Added TF Variables to use to build.

4351735

Check current playbook directory.

6a0f55e

remove versions.tf

bacaa2f

Edited backend type and vars.

f72a422

Locate playbook directory.

7403414

Change directory for project.

f666fed

Remove backend type.

1e1bdbe

Typo fix.

e6969d2

Change tfvars to j2 temp.

73e4f9e

SSH gen alternative method.

d834bb6

SSH alt method 2.

6a3cea8

Update cluster_gateway_ip output variable.

608881f

Include cluster_nodes variable in output.

b4096ed

Remove backend from cluster_nodes variable.

4fa6cbb

MaxBed4d added 18 commits January 10, 2024 12:07

Remove Ansible-galaxy install as it should be done by the requirements.

ceabfe2

This is a combination of 5 commits.

a40845e

No Wazuh deploy.

5a7c94b

Create infrastructure only option.

4519eab

Checkout the main ansible folder so that these changes are solely foc…

232ae60

…used on infrastructure deployment.

Create a second App UI to deploy just the infrastructure as a test.

6fa2086

Update meta UI for Infrastructure deployment.

00ab6fb

Update UI to allow Openstack version select.

6bedaf8

Try to allow custom input.

775b7f1

UI Changes

305fc34

Given user choice over image.

cee87a5

Change the way the ssh command is provided.

1cddc5f

set ssh user after automatically.

acf6248

Change name of app.yaml

f987bd8

Fix ssh user declaration.

257fdce

Improved UI with ssh username input.

a8bec13

Change description pipe symbol to have multiline outputs.

6b8eb6f

Tidy up of the code for the infrastructure deployment.

b257275

MaxBed4d and others added 2 commits January 30, 2024 11:47

Changes to remain consistent with OpenStack deployment future PR.

e9b5c85

Discard changes to ansible/vars/defaults.yml

8b27ac1

markgoddard suggested changes Jan 31, 2024

View reviewed changes

MaxBed4d and others added 8 commits January 31, 2024 11:50

Remove unused variable.

b12c713

Merge branch 'Infrastructure-Deployment' of https://github.com/stackh…

07368ad

…pc/terraform-kayobe-multinode into Infrastructure-Deployment

Updated the vault password to be empty if no password is provided rat…

21a0f7d

…her than a default.

Remove duplicate requirements file.

eecef28

Update ui-meta/multinode-infra-appliance.yml

93ddb5b

Update description. Co-authored-by: Mark Goddard <mark@stackhpc.com>

Update ui-meta/multinode-infra-appliance.yml

4d5d2f1

Update App Label. Co-authored-by: Mark Goddard <mark@stackhpc.com>

Correct the default user input.

d91b092

Merge branch 'Infrastructure-Deployment' of https://github.com/stackh…

0f92e61

…pc/terraform-kayobe-multinode into Infrastructure-Deployment

	Please provide the OpenStack GitHub Branch name you wish to deploy.
	Please provide the Kayobe GitHub Branch name you wish to deploy.

	Please provide the GitHub Branch with the OpenStack configuration you wish to deploy.
	Please provide the StackHPC Kayobe Configuration GitHub Branch you wish to deploy.

Conversation

MaxBed4d commented Jan 26, 2024

Uh oh!

Alex-Welsh commented Jan 26, 2024

Uh oh!

markgoddard left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaxBed4d Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

MaxBed4d Jan 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

MaxBed4d Jan 31, 2024 •

edited

Loading

MaxBed4d Jan 31, 2024 •

edited

Loading