From 5c82ece0ea35cf34fda221032676767c31590d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= <rpiliszek@7bulls.com> Date: Fri, 5 Aug 2022 17:55:34 +0200 Subject: [PATCH] Reset to ICG output --- nginx/config.yaml | 2 +- nginx/inventory.j2 | 2 +- piacere_monitoring/config.yaml | 2 +- piacere_monitoring/inventory.j2 | 2 +- piacere_monitoring/main.yml | 2 +- piacere_monitoring/piacere_monitoring.yaml | 1 - terraform/config.yaml | 2 +- terraform/main.tf | 16 ++++++++-------- terraform/output.tf | 2 +- 9 files changed, 15 insertions(+), 16 deletions(-) delete mode 100644 piacere_monitoring/piacere_monitoring.yaml diff --git a/nginx/config.yaml b/nginx/config.yaml index 30a5fdc..8b7284e 100644 --- a/nginx/config.yaml +++ b/nginx/config.yaml @@ -1,7 +1,7 @@ --- input: - - instance_ip_nginx_host + - instance_ip_vm1 - instance_server_private_key_user1 output: [] engine: ansible diff --git a/nginx/inventory.j2 b/nginx/inventory.j2 index 0ee7729..c869825 100644 --- a/nginx/inventory.j2 +++ b/nginx/inventory.j2 @@ -1,7 +1,7 @@ [servers_for_nginx] -{{ instance_ip_nginx_host }} +{{ instance_ip_vm1 }} [servers_for_nginx:vars] ansible_connection=ssh diff --git a/piacere_monitoring/config.yaml b/piacere_monitoring/config.yaml index 30a5fdc..8b7284e 100644 --- a/piacere_monitoring/config.yaml +++ b/piacere_monitoring/config.yaml @@ -1,7 +1,7 @@ --- input: - - instance_ip_nginx_host + - instance_ip_vm1 - instance_server_private_key_user1 output: [] engine: ansible diff --git a/piacere_monitoring/inventory.j2 b/piacere_monitoring/inventory.j2 index fef1c49..fda17b3 100644 --- a/piacere_monitoring/inventory.j2 +++ b/piacere_monitoring/inventory.j2 @@ -1,7 +1,7 @@ [servers_for_piacere_monitoring] -{{ instance_ip_nginx_host }} +{{ instance_ip_vm1 }} [servers_for_piacere_monitoring:vars] ansible_connection=ssh diff --git a/piacere_monitoring/main.yml b/piacere_monitoring/main.yml index 657a7ea..a0edc4f 100644 --- a/piacere_monitoring/main.yml +++ b/piacere_monitoring/main.yml @@ -19,4 +19,4 @@ vars_files: - vars/main.yaml roles: - - dj-wasabi.telegraf \ No newline at end of file + - dj-wasabi.telegraf diff --git a/piacere_monitoring/piacere_monitoring.yaml b/piacere_monitoring/piacere_monitoring.yaml deleted file mode 100644 index 8b13789..0000000 --- a/piacere_monitoring/piacere_monitoring.yaml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/terraform/config.yaml b/terraform/config.yaml index 6f073a2..783f272 100644 --- a/terraform/config.yaml +++ b/terraform/config.yaml @@ -11,6 +11,6 @@ output: - instance_server_public_key_user1 - instance_server_private_key_user1 - - instance_ip_nginx_host + - instance_ip_vm1 ... diff --git a/terraform/main.tf b/terraform/main.tf index dfd42e1..53dc253 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -91,6 +91,14 @@ resource "openstack_networking_router_interface_v2" "net1_router_interface" { +# Create ssh keys +resource "openstack_compute_keypair_v2" "user1" { + name = "user1" + # public_key = "user1" +} + + + # CREATING SECURITY_GROUP resource "openstack_compute_secgroup_v2" "icmp" { @@ -138,11 +146,3 @@ resource "openstack_compute_secgroup_v2" "ssh" { } - - -# Create ssh keys -resource "openstack_compute_keypair_v2" "user1" { - name = "user1" - # public_key = "" -} - diff --git a/terraform/output.tf b/terraform/output.tf index beabebf..f0cc70b 100644 --- a/terraform/output.tf +++ b/terraform/output.tf @@ -8,7 +8,7 @@ output "instance_server_private_key_user1" { value = openstack_compute_keypair_v2.user1.private_key } -output "instance_ip_nginx_host" { +output "instance_ip_vm1" { value = openstack_compute_floatingip_associate_v2.vm1_floating_ip_association.floating_ip } -- GitLab