Minor changes

chatops_deployment/ansible/dev/host_vars/localhost/vars.yml

@@ -3,3 +3,4 @@ terraform_deployment: chatops-development
 terraform_external_network_id: 0dc30001-edfb-4137-be76-8e51f38fd650
 terraform_stack_volume_id: f8d37290-598e-4dc7-a8d6-e771a64c549f
 bastion_key_passphrase: "{{ vault_bastion_key_passphrase }}"
+cloud: "scratch-dev"

chatops_deployment/ansible/prod/host_vars/localhost/vars.yml

@@ -3,3 +3,4 @@ terraform_deployment: chatops-production
 terraform_external_network_id: 5283f642-8bd8-48b6-8608-fa3006ff4539
 terraform_stack_volume_id: df3fdff2-30fc-4aca-b8e5-03412a507607
 bastion_key_passphrase: "{{ vault_bastion_key_passphrase }}"
+cloud: "cloud-microservices"

chatops_deployment/ansible/roles/chatops/tasks/main.yml

@@ -45,7 +45,7 @@
 - name: Start ChatOps container
   community.docker.docker_container:
     image: "{{ chatops_image }}"
-    name: "chatops-{{ count }}"
+    name: "chatops"
     pull: always
     state: started
     restart: true

chatops_deployment/ansible/roles/ssl_certificates/tasks/ssl.yml

@@ -1,12 +1,12 @@
 ---
 - name: Get key info
-  community.crypto.openssl_ssl_certificates_privatekey_info:
+  community.crypto.openssl_privatekey_info:
     path: "./{{ env }}_ssl/{{ service }}.key"
   register: ssl_certificates_privatekey_info
   ignore_errors: true
 
 - name: Get certificate info
-  community.crypto.x509_ssl_certificates_certificate_info:
+  community.crypto.x509_certificate_info:
     path: "./{{ env }}_ssl/{{ service }}.crt"
   register: ssl_certificates_certificate_info
   ignore_errors: true

chatops_deployment/ansible/roles/terraform/templates/terraform.tfvars.j2

@@ -2,4 +2,5 @@ deployment="{{ terraform_deployment }}"
 external_network_id="{{ terraform_external_network_id }}"
 floating_ip="{{ terraform_floating_ip }}"
 stack_volume_id="{{ terraform_stack_volume_id }}"
-environment="{{ env }}"
+environment="{{ env }}"
+cloud="{{ cloud }}"

chatops_deployment/terraform/main.tf

@@ -9,14 +9,15 @@ terraform {
 }
 
 provider "openstack" {
-  cloud = "openstack"
+  cloud = var.cloud
 }
 
 module "networking" {
   source = "./modules/networking"
 
   deployment          = var.deployment
   external_network_id = var.external_network_id
+  cloud = var.cloud
 }
 
 module "compute" {
@@ -28,4 +29,5 @@ module "compute" {
   deployment            = var.deployment
   stack_volume_id = var.stack_volume_id
   environment = var.environment
-}
+  cloud = var.cloud
+}

chatops_deployment/terraform/modules/compute/main.tf

@@ -9,7 +9,7 @@ terraform {
 }
 
 provider "openstack" {
-  cloud = "openstack"
+  cloud = var.cloud
 }
 
 resource "openstack_compute_keypair_v2" "bastion_keypair" {

chatops_deployment/terraform/modules/compute/variables.tf

@@ -4,4 +4,5 @@ variable "floating_ip" {}
 variable "private_subnet" {}
 variable "stack_volume_id" {}
 variable "environment" {}
-variable "stack_secgroup" {}
+variable "stack_secgroup" {}
+variable "cloud" {}

chatops_deployment/terraform/modules/networking/main.tf

@@ -9,7 +9,7 @@ terraform {
 }
 
 provider "openstack" {
-  cloud = "openstack"
+  cloud = var.cloud
 }
 
 resource "openstack_networking_network_v2" "private_network" {

chatops_deployment/terraform/modules/networking/variables.tf

@@ -1,2 +1,3 @@
 variable "deployment" {}
-variable "external_network_id" {}
+variable "external_network_id" {}
+variable "cloud" {}

chatops_deployment/terraform/variables.tf

@@ -22,3 +22,8 @@ variable "environment" {
   type = string
   description = "The environment being deployed into. E.g. dev, staging, prod"
 }
+
+variable "cloud" {
+  type = string
+  description = "clouds.yaml entry to use for authentication."
+}