Tidy up of the code for the infrastructure deployment.

Author: MaxBed4d

group_vars/openstack.yml

@@ -23,18 +23,4 @@ terraform_project_path: "{{ playbook_dir }}"
 # Valid values are 'present' and 'absent'
 terraform_state: "{{ cluster_state | default('present') }}"
 
-# The user that should be used to SSH to the cluster hosts
-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
-  #- variables.tf
-  # - authentication.tf
-  # - compute_instances.tf
-  # - data.tf
-  # - versions.tf
-  # - volumes.tf
-  # - terraform.tfvars
-
-# Assign the ansible ssh public key from the ansible runner's generated ssh key

multinode-infra-app.yml

@@ -16,15 +16,18 @@
         src: "{{ playbook_dir }}/templates/userdata.cfg.tpl.j2"
         dest: "{{ playbook_dir }}/templates/userdata.cfg.tpl"
 
-# Provision the infrastructure
-# The CaaS puts hosts for accessing the OpenStack API into the 'openstack' group
+# Provision the infrastructure The CaaS puts hosts for accessing the OpenStack
+# API into the 'openstack' group
 - hosts: openstack
   roles:
     - cluster_infra
 
 - hosts: localhost
   tasks: 
-  # Check whether an ans_vlt_pwd variable is defined and if so, save it into a file called '~/vault.password'. If it doesn't exist, create a the '~/vault.password' file with ans_vlt_pwd = "password_not_set" as the password.
+  # Check whether an ans_vlt_pwd variable is defined and if so, save it into a
+  # file called '~/vault.password'. If it doesn't exist, create a the
+  # '~/vault.password' file with ans_vlt_pwd = "password_not_set" as the
+  # password.
     - name: Create vault password file
       vars:
         ans_dflt: 'default_password'
@@ -33,37 +36,6 @@
         dest: "~/vault.password"
         mode: 0600
 
-    # - block:
-      # # Install the ansible requirements
-      # - name: Install ansible posix
-      #   command: ansible-galaxy collection install ansible.posix
-
-      # # Install the ansible requirements
-      # - name: Install ansible community general
-      #   command: ansible-galaxy collection install community.general
-
-      # # Install the ansible requirements
-      # - name: Install ansible requirements
-      #   command: ansible-galaxy install -r ansible/requirements.yml
-
-
-      # - name: Deploy ansible playbook manually
-      #   command: ansible-playbook -i ansible/inventory.yml ansible/configure-hosts.yml
-      #   vars:
-      #    terraform_binary_directory: "{{ playbook_dir }}/../bin"
-      #    terraform_binary_path: "{{ terraform_binary_directory }}/../terraform"
-      #    terraform_project_path: "{{ playbook_dir }}"
-
-#      - debug: var=outputs
-#        vars:
-#          outputs: 
-#            cluster_access_ip: "{{ hostvars[groups['openstack'][0]].cluster_gateway_ip }}"
-
-      # - name: Debug groups
-      #   debug:
-      #     msg: "{{ groups | to_yaml }}"   
-#      when: cluster_state != "absent"
-
 # If openstack_deploy is true then continue if not end the playbook.
 
 # Import the playbook to start configuring the multi-node hosts.
@@ -82,16 +54,7 @@
         cmd: "bash ~/deploy-openstack.sh"
       when: openstack_deploy == true
 
-
-# - hosts: ansible_control
-#   vars:
-#     ansible_pipelining: true
-#     ansible_ssh_pipelining: true
-#   tasks: 
-#     - name: Deploy OpenStack.
-#       ansible.builtin.shell:
-#         cmd: "./deploy-openstack.sh"
-
+# This is to get the ip of the ansible-controller host.
 - hosts: localhost
   tasks: 
     - debug: var=outputs

outputs.tf

@@ -53,24 +53,6 @@ resource "local_file" "admin_networks" {
   file_permission = "0644"
 }
 
-# output "cluster_nodes" {
-#   description = "A list of the cluster nodes and their IP addresses which will be used by the Ansible inventory"
-#   value       = [{
-#        name = openstack_compute_instance_v2.ansible_control.name
-#        ip = openstack_compute_instance_v2.ansible_control.access_ip_v4
-#        groups        = ["multinode_ansible_control"]
-#   }]
-# }
-
-# flatten([
-#  for node in openstack_compute_instance_v2.compute: {
-#      name = node.name
-#      ip = node.access_ip_v4
-#        groups        = ["compute"]
-#    }
-#   ])
-# }
-
 resource "local_file" "openstack_inventory" {
   content = templatefile(
     "${path.module}/templates/openstack-inventory.tpl",
@@ -151,7 +133,8 @@ output "cluster_nodes" {
   )
 }
 
-# For Backup
+# Template of all the hosts' configuration which can be used to generate Ansible varables.
+
 # resource "ansible_host" "control_host" {
 #   name   = openstack_compute_instance_v2.ansible_control.access_ip_v4
 #   groups = ["ansible_control"]

roles/cluster_infra/tasks/main.yml

@@ -37,18 +37,6 @@
     - cluster_upgrade_system_packages is not defined or not cluster_upgrade_system_packages
 
 
-- name: Template Terraform files into project directory
-  template:
-    src: "{{ item }}.j2"
-    dest: "{{ terraform_project_path }}/{{ item }}"
-  loop: "{{ tf_files }}"
-
-#- name: Copy Terraform files into project directory
-#  ansible.builtin.copy:
-#    src: "{{ item }}.tf"
-#    dest: "{{ terraform_project_path }}/{{ item }}.tf"
-#  loop: "{{ query('fileglob', '../../../*') }}"
-
 - name: Provision infrastructure
   include_role:
     name: stackhpc.terraform.infra