Importing the changes made to be able to deploy MN.

ansible.cfg

@@ -0,0 +1,11 @@
+[defaults]
+stdout_callback = yaml
+callbacks_enabled = timer, profile_tasks, profile_roles
+host_key_checking = False
+pipelining = True
+forks = 30
+deprecation_warnings=False
+roles_path = roles
+
+[ssh_connection]
+ssh_args = -o ControlMaster=auto -o ControlPersist=60s

ansible/ansible.cfg

@@ -5,6 +5,7 @@ host_key_checking = False
 pipelining = True
 forks = 30
 deprecation_warnings=False
+roles_path = ../roles
 
 [ssh_connection]
 ssh_args = -o ControlMaster=auto -o ControlPersist=60s

ansible/fix-homedir-ownership.yml

@@ -1,6 +1,6 @@
 ---
 - name: Fix Home Directory Ownership
-  hosts: all
+  hosts: all, !localhost
   gather_facts: false
   vars:
     # At the time of running this playbook the home directory is not owned by the user.
@@ -16,7 +16,7 @@
         gather_subset:
           - user_dir
 
-    - name: Ensure homedir is owned by {{ ansible_user }}
+    - name: Ensure homedir is owned by "{{ ansible_user }}"
       ansible.builtin.file:
         dest: "{{ ansible_env.HOME }}"
         state: directory

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/yoga
+kayobe_config_version: "{{ kayobe_config_branch | default('stackhpc/yoga')}}"
 kayobe_config_name: kayobe-config
 kayobe_config_environment: ci-multinode
 
 kayobe_repo: https://github.com/stackhpc/kayobe.git
-kayobe_version: stackhpc/yoga
+kayobe_version: "{{ kayobe_version_branch | default('stackhpc/yoga') }}"
 kayobe_name: kayobe
 
 openstack_config_repo: https://github.com/stackhpc/openstack-config-multinode
@@ -16,9 +16,7 @@ openstack_config_name: openstack-config
 
 vault_password_path: "~/vault.password"
 
-ssh_key_path:
-
-vxlan_vni:
+ssh_key_path: "{{ cluster_ssh_private_key_file }}"
 
 root_domain: sms-lab.cloud
 

authentication.tf

@@ -1,4 +1,4 @@
 resource "openstack_compute_keypair_v2" "keypair" {
   name       = var.multinode_keypair
-  public_key = file(var.ssh_public_key)
+  public_key = var.ssh_public_key
 }

group_vars/openstack.yml

@@ -0,0 +1,26 @@
+# The default Terraform state key for backends that support it
+terraform_state_key: "cluster/{{ cluster_id }}/tfstate"
+
+# Set up the terraform backend
+# This setup allows us to use the Consul backend when enabled without any changes
+#terraform_backend_type: 'local'
+terraform_backend_type: "{{ 'consul' if 'CONSUL_HTTP_ADDR' in ansible_env else 'local' }}"
+terraform_backend_config_defaults:
+  consul:
+    path: "{{ terraform_state_key }}"
+    gzip: "true"
+  local: {}
+terraform_backend_config: "{{ terraform_backend_config_defaults[terraform_backend_type] }}"
+
+# These variables control the location of the Terraform binary
+terraform_binary_directory: "{{ playbook_dir }}/bin"
+terraform_binary_path: "{{ terraform_binary_directory }}/terraform"
+
+# This controls the location where the Terraform files are rendered
+terraform_project_path: "{{ playbook_dir }}"
+
+# Indicates whether the Terraform operation is reconciling or removing resources
+# Valid values are 'present' and 'absent'
+terraform_state: "{{ cluster_state | default('present') }}"
+
+cluster_ssh_user: "{{ ssh_user }}"

multinode-app.yml

@@ -0,0 +1,66 @@
+---
+
+- hosts: localhost
+  tasks:    
+    - name: Show Playbook Directory
+      debug:
+       msg: "{{ playbook_dir }}"
+
+    - name: Template Terraform files into project directory
+      template:
+        src: terraform.tfvars.j2
+        dest: "{{ playbook_dir }}/terraform.tfvars"
+
+    - name: Template Terraform userdata.cfg.tpl files into project template directory
+      template:
+        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
+- 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.
+    - name: Create vault password file
+      vars:
+        ans_dflt: 'default_password'
+      ansible.builtin.copy:
+        content: "{{ ans_vlt_pwd | default( ans_dflt , true ) }}"
+        dest: "~/vault.password"
+        mode: 0600
+
+# If openstack_deploy is true then continue if not end the playbook.
+
+# 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
+
+
+- hosts: ansible_control
+  vars:
+    ansible_pipelining: true
+    ansible_ssh_pipelining: true
+  tasks: 
+    - name: Deploy OpenStack.
+      ansible.builtin.command:
+        cmd: "bash ~/deploy-openstack.sh"
+      when: openstack_deploy == true
+
+# This is to get the ip of the ansible-controller host.
+- hosts: localhost
+  tasks: 
+    - debug: var=outputs
+      vars:
+        outputs: 
+          cluster_access_ip: "{{ hostvars[groups['openstack'][0]].cluster_gateway_ip }}"

outputs.tf

@@ -2,6 +2,10 @@ output "ansible_control_access_ip_v4" {
   value = openstack_compute_instance_v2.ansible_control.access_ip_v4
 }
 
+output "cluster_gateway_ip" {
+  value = openstack_compute_instance_v2.ansible_control.access_ip_v4
+}
+
 output "seed_access_ip_v4" {
   value = openstack_compute_instance_v2.seed.access_ip_v4
 }
@@ -75,38 +79,94 @@ resource "local_file" "deploy_openstack" {
   file_permission = "0755"
 }
 
-resource "ansible_host" "control_host" {
-  name   = openstack_compute_instance_v2.ansible_control.access_ip_v4
-  groups = ["ansible_control"]
+output "cluster_nodes" {
+  description = "A list of the cluster nodes and their IP addresses which will be used by the Ansible inventory"
+  value       = concat(
+    [
+      {
+        name   = openstack_compute_instance_v2.ansible_control.name
+        ip     = openstack_compute_instance_v2.ansible_control.access_ip_v4
+        groups = ["ansible_control"]
+        variables = {
+          ansible_user = var.ssh_user
+        }
+      }
+    ],
+    flatten([
+      for node in openstack_compute_instance_v2.compute: {
+        name   = node.name
+        ip     = node.access_ip_v4
+        groups = ["compute"]
+        variables = {
+          ansible_user = var.ssh_user
+        }  
+      }
+    ]),
+    flatten([
+      for node in openstack_compute_instance_v2.controller: {
+        name   = node.name
+        ip     = node.access_ip_v4
+        groups = ["controllers"]
+        variables = {
+          ansible_user = var.ssh_user
+        }
+      }
+    ]),    
+    [{
+      name   = openstack_compute_instance_v2.seed.name
+      ip     = openstack_compute_instance_v2.seed.access_ip_v4
+      groups = ["seed"]
+      variables = {
+        ansible_user = var.ssh_user
+      }
+    }],
+    flatten([
+      for node in openstack_compute_instance_v2.storage: {
+        name   = node.name
+        ip     = node.access_ip_v4
+        groups = ["storage"]
+        variables = {
+          ansible_user = var.ssh_user
+        }
+      }
+    ])  
+  )
 }
 
-resource "ansible_host" "compute_host" {
-  for_each = { for host in openstack_compute_instance_v2.compute : host.name => host.access_ip_v4 }
-  name = each.value
-  groups = ["compute"]
-}
+# Template of all the hosts' configuration which can be used to generate Ansible varables.
 
-resource "ansible_host" "controllers_hosts" {
-  for_each = { for host in openstack_compute_instance_v2.controller : host.name => host.access_ip_v4 }
-  name = each.value
-  groups = ["controllers"]
-}
+# resource "ansible_host" "control_host" {
+#   name   = openstack_compute_instance_v2.ansible_control.access_ip_v4
+#   groups = ["ansible_control"]
+# }
 
-resource "ansible_host" "seed_host" {
-  name   = openstack_compute_instance_v2.seed.access_ip_v4
-  groups = ["seed"]
-}
+# resource "ansible_host" "compute_host" {
+#   for_each = { for host in openstack_compute_instance_v2.compute : host.name => host.access_ip_v4 }
+#   name = each.value
+#   groups = ["compute"]
+# }
 
-resource "ansible_host" "storage" {
-  for_each = { for host in openstack_compute_instance_v2.storage : host.name => host.access_ip_v4 }
-  name = each.value
-  groups = ["storage"]
-}
+# resource "ansible_host" "controllers_hosts" {
+#   for_each = { for host in openstack_compute_instance_v2.controller : host.name => host.access_ip_v4 }
+#   name = each.value
+#   groups = ["controllers"]
+# }
 
-resource "ansible_group" "cluster_group" {
-  name     = "cluster"
-  children = ["compute", "ansible_control", "controllers", "seed", "storage"]
-  variables = {
-    ansible_user = var.ssh_user
-  }
-}
+# resource "ansible_host" "seed_host" {
+#   name   = openstack_compute_instance_v2.seed.access_ip_v4
+#   groups = ["seed"]
+# }
+
+# resource "ansible_host" "storage" {
+#   for_each = { for host in openstack_compute_instance_v2.storage : host.name => host.access_ip_v4 }
+#   name = each.value
+#   groups = ["storage"]
+# }
+
+# resource "ansible_group" "cluster_group" {
+#   name     = "cluster"
+#   children = ["compute", "ansible_control", "controllers", "seed", "storage"]
+#   variables = {
+#     ansible_user = var.ssh_user
+#   }
+# }

requirements.yml

@@ -0,0 +1,9 @@
+---
+collections:
+  - name: https://github.com/stackhpc/ansible-collection-terraform
+    type: git
+    version: 8c7acce4538aab8c0e928972155a2ccb5cb1b2a1
+  - name: cloud.terraform
+  - name: ansible.posix
+roles:
+  - src: mrlesmithjr.manage_lvm

roles/cluster_infra/tasks/main.yml

@@ -0,0 +1,42 @@
+---
+
+- name: Install Terraform binary
+  include_role:
+    name: stackhpc.terraform.install
+
+- name: Make Terraform project directory
+  file:
+    path: "{{ terraform_project_path }}"
+    state: directory
+
+- name: Write backend configuration
+  copy:
+    content: |
+      terraform {
+        backend "{{ terraform_backend_type }}" { }
+      }
+    dest: "{{ terraform_project_path }}/backend.tf"
+
+# Patching in this appliance is implemented as a switch to a new base image
+# So unless explicitly patching, we want to use the same image as last time
+# To do this, we query the previous Terraform state before updating
+- block:
+    - name: Get previous Terraform state
+      stackhpc.terraform.terraform_output:
+        binary_path: "{{ terraform_binary_path }}"
+        project_path: "{{ terraform_project_path }}"
+        backend_config: "{{ terraform_backend_config }}"
+      register: cluster_infra_terraform_output
+
+    - name: Extract image from Terraform state
+      set_fact:
+        cluster_previous_image: "{{ cluster_infra_terraform_output.outputs.cluster_image.value }}"
+      when: '"cluster_image" in cluster_infra_terraform_output.outputs'
+  when:
+    - terraform_state == "present"
+    - cluster_upgrade_system_packages is not defined or not cluster_upgrade_system_packages
+
+
+- name: Provision infrastructure
+  include_role:
+    name: stackhpc.terraform.infra

roles/requirements.yml

@@ -0,0 +1 @@
+../requirements.yml

templates/deploy-openstack.tpl

@@ -131,7 +131,7 @@ fi
 if [[ "$(sudo docker image ls)" == *"kayobe"* ]]; then
   echo "Image already exists skipping docker build"
 else
-  sudo DOCKER_BUILDKIT=1 docker build --network host --build-arg BASE_IMAGE=$$BASE_IMAGE --file $${config_directories[kayobe]}/.automation/docker/kayobe/Dockerfile --tag kayobe:latest $${config_directories[kayobe]}
+  sudo DOCKER_BUILDKIT=1 docker build --network host --build-arg BASE_IMAGE=$BASE_IMAGE --file $${config_directories[kayobe]}/.automation/docker/kayobe/Dockerfile --tag kayobe:latest $${config_directories[kayobe]}
 fi
 
 set +x

templates/userdata.cfg.tpl → templates/userdata.cfg.tpl.j2

@@ -7,3 +7,6 @@ packages:
   - git
   - vim
   - tmux
+ssh_authorized_keys:
+  - "{{ cluster_deploy_ssh_public_key }}"
+  - "{{ cluster_user_ssh_public_key }}"