From a6866379490adc836133bc3d08a6f6f8e8cf87fa Mon Sep 17 00:00:00 2001
From: Debora Benedetto <debora.benedetto@hpe.com>
Date: Tue, 19 Jul 2022 19:35:38 +0200
Subject: [PATCH] add credentials template for openstack
---
template-location.properties | 1 +
templates/terraform/open_stack/ssh_key.tpl | 5 +++++
templates/terraform/open_stack/virtual_machine.tpl | 8 +-------
templates/terraform/open_stack/virtual_machine_out.tpl | 4 ++--
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/template-location.properties b/template-location.properties
index abe0206..1506dfa 100644
--- a/template-location.properties
+++ b/template-location.properties
@@ -5,6 +5,7 @@ vms = templates/terraform/open_stack/virtual_machine.tpl
vms_out = templates/terraform/open_stack/virtual_machine_out.tpl
networks = templates/terraform/open_stack/network.tpl
computingGroup = templates/terraform/open_stack/port_rule.tpl
+credentials = templates/terraform/open_stack/ssh_key.tpl
[terraform.azure]
init = templates/terraform/azure/init.tpl
diff --git a/templates/terraform/open_stack/ssh_key.tpl b/templates/terraform/open_stack/ssh_key.tpl
index e69de29..b436217 100644
--- a/templates/terraform/open_stack/ssh_key.tpl
+++ b/templates/terraform/open_stack/ssh_key.tpl
@@ -0,0 +1,5 @@
+# Create ssh keys
+resource "openstack_compute_keypair_v2" "{{ infra_element_name }}" {
+ name = "{{ user }}"
+ # public_key = "{{ user }}"
+}
\ No newline at end of file
diff --git a/templates/terraform/open_stack/virtual_machine.tpl b/templates/terraform/open_stack/virtual_machine.tpl
index 218d0f1..c283198 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.{{ vm_key_name }}.name
+ key_pair = openstack_compute_keypair_v2.{{ credentials }}.name
network {
port = openstack_networking_port_v2.{{ i1.belongsTo }}.id
}
@@ -26,12 +26,6 @@ resource "openstack_compute_instance_v2" "{{ infra_element_name }}" {
}
-# Create ssh keys
-resource "openstack_compute_keypair_v2" "{{ vm_key_name }}" {
- name = "{{ vm_key_name }}"
- # public_key = "{{ ssh_key_file }}"
-}
-
# Create floating ip
resource "openstack_networking_floatingip_v2" "{{infra_element_name ~ "_floating_ip"}}" {
pool = "external"
diff --git a/templates/terraform/open_stack/virtual_machine_out.tpl b/templates/terraform/open_stack/virtual_machine_out.tpl
index e39fa9f..67de692 100644
--- a/templates/terraform/open_stack/virtual_machine_out.tpl
+++ b/templates/terraform/open_stack/virtual_machine_out.tpl
@@ -1,9 +1,9 @@
output "instance_server_public_key_{{ vm_key_name }}" {
- value = openstack_compute_keypair_v2.{{ vm_key_name }}.public_key
+ value = openstack_compute_keypair_v2.{{ credentials }}.public_key
}
output "instance_server_private_key_{{ vm_key_name }}" {
- value = openstack_compute_keypair_v2.{{ vm_key_name }}.private_key
+ value = openstack_compute_keypair_v2.{{ credentials }}.private_key
}
output "instance_ip_{{ vm_name }}" {
--
GitLab