From 19097d75ec9c7e99c703952b5c2a9f42a02671c3 Mon Sep 17 00:00:00 2001
From: Debora Benedetto <debora.benedetto@hpe.com>
Date: Fri, 8 Jul 2022 14:17:32 +0200
Subject: [PATCH] bugfix ssh key vm openstack template
---
.../nginx_openstack/terraform/main.tf | 10 +++++-----
templates/terraform/open_stack/virtual_machine.tpl | 4 ++--
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/output_files_generated/nginx_openstack/terraform/main.tf b/output_files_generated/nginx_openstack/terraform/main.tf
index 25eb44a..eaa7f3d 100644
--- a/output_files_generated/nginx_openstack/terraform/main.tf
+++ b/output_files_generated/nginx_openstack/terraform/main.tf
@@ -35,7 +35,7 @@ resource "openstack_compute_instance_v2" "vm1" {
name = "nginx-host"
image_name = "ubuntu-20.04.3"
flavor_name = "small"
- key_pair = openstack_compute_keypair_v2.ssh_key.name
+ key_pair = openstack_compute_keypair_v2.user1.name
network {
port = openstack_networking_port_v2.net1.id
}
@@ -53,15 +53,15 @@ resource "openstack_compute_instance_v2" "vm1" {
# secrets can be taken from environment variables at IEM but these security issues I will leave them to y2, the user can also be problematic ubuntu/root/centos/...
provisioner "local-exec" {
- command = "ansible-playbook -u root -i '${openstack_networking_floatingip_v2.vm1_floating_ip_association.address},' ansible/playbooks/pma/site.yaml --extra-vars '{\"pma_deployment_id\": \"123e4567-e89b-12d3-a456-426614174002\", \"pma_influxdb_bucket\": \"bucket\", \"pma_influxdb_token\": \"piacerePassword\", \"pma_influxdb_org\": \"piacere\", \"pma_influxdb_addr\": \"https://influxdb.pm.ci.piacere.digital.tecnalia.dev\" }'"
+ command = "ansible-playbook -u root -i '${openstack_networking_floatingip_v2.vm1_floating_ip.address},' ansible/playbooks/pma/site.yaml --extra-vars '{\"pma_deployment_id\": \"123e4567-e89b-12d3-a456-426614174002\", \"pma_influxdb_bucket\": \"bucket\", \"pma_influxdb_token\": \"piacerePassword\", \"pma_influxdb_org\": \"piacere\", \"pma_influxdb_addr\": \"https://influxdb.pm.ci.piacere.digital.tecnalia.dev\" }'"
}
}
# Create ssh keys
-resource "openstack_compute_keypair_v2" "ssh_key" {
- name = ""
- public_key = ""
+resource "openstack_compute_keypair_v2" "user1" {
+ name = "user1"
+ # public_key = ""
}
# Create floating ip
diff --git a/templates/terraform/open_stack/virtual_machine.tpl b/templates/terraform/open_stack/virtual_machine.tpl
index e4d570e..218d0f1 100644
--- a/templates/terraform/open_stack/virtual_machine.tpl
+++ b/templates/terraform/open_stack/virtual_machine.tpl
@@ -3,7 +3,7 @@ resource "openstack_compute_instance_v2" "{{ infra_element_name }}" {
name = "{{ vm_name }}"
image_name = "{{ os }}"
flavor_name = "{{ vm_flavor }}"
- key_pair = openstack_compute_keypair_v2.{{ credentials }}.name
+ key_pair = openstack_compute_keypair_v2.{{ vm_key_name }}.name
network {
port = openstack_networking_port_v2.{{ i1.belongsTo }}.id
}
@@ -21,7 +21,7 @@ resource "openstack_compute_instance_v2" "{{ infra_element_name }}" {
# secrets can be taken from environment variables at IEM but these security issues I will leave them to y2, the user can also be problematic ubuntu/root/centos/...
provisioner "local-exec" {
- command = "ansible-playbook -u root -i '${openstack_networking_floatingip_v2.{{ infra_element_name ~ "_floating_ip_association" }}.address},' ansible/playbooks/pma/site.yaml --extra-vars '{\"pma_deployment_id\": \"123e4567-e89b-12d3-a456-426614174002\", \"pma_influxdb_bucket\": \"bucket\", \"pma_influxdb_token\": \"piacerePassword\", \"pma_influxdb_org\": \"piacere\", \"pma_influxdb_addr\": \"https://influxdb.pm.ci.piacere.digital.tecnalia.dev\" }'"
+ command = "ansible-playbook -u root -i '${openstack_networking_floatingip_v2.{{ infra_element_name ~ "_floating_ip"}}.address},' ansible/playbooks/pma/site.yaml --extra-vars '{\"pma_deployment_id\": \"123e4567-e89b-12d3-a456-426614174002\", \"pma_influxdb_bucket\": \"bucket\", \"pma_influxdb_token\": \"piacerePassword\", \"pma_influxdb_org\": \"piacere\", \"pma_influxdb_addr\": \"https://influxdb.pm.ci.piacere.digital.tecnalia.dev\" }'"
}
}
--
GitLab