diff --git a/nginx/config.yaml b/nginx/config.yaml index 30a5fdcdf815f54e62745da1dbc664b1e42c0d56..8b7284e426fba96d8fffd9d11e5d153b09edf120 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 0ee7729eea967e26b05a6f183c3d5d5414fc77eb..c869825264308b4b47ca862b8b9e22d3bc733f11 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 30a5fdcdf815f54e62745da1dbc664b1e42c0d56..8b7284e426fba96d8fffd9d11e5d153b09edf120 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 fef1c49e2c00c126e84029dd68c4291a2f8fea59..fda17b36f330a491a1fd872a13c5eed702e1b122 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 657a7ea8c4c1376b0437e53ec82d7c4ebe6d0ec2..a0edc4f654d2f8dc8fbe03d7b0f58ea1fa46a1c1 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 8b137891791fe96927ad78e64b0aad7bded08bdc..0000000000000000000000000000000000000000 --- a/piacere_monitoring/piacere_monitoring.yaml +++ /dev/null @@ -1 +0,0 @@ - diff --git a/terraform/config.yaml b/terraform/config.yaml index 6f073a2adbc7af6e05d2d8f9a8e674bc965c13aa..783f272d2a640a7e68f65c9d62c1bee0abb9430a 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 dfd42e10ffbc6a8b4330df3cd6f4eca90e16ecce..53dc25324685ff841d8f5dca3e891e5d2cea8ccb 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 beabebf135921461be64738fb2fd505ec34835bf..f0cc70b7b297f4e5e45369d934c2537507d9fff7 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 }