diff --git a/terraform/main.tf b/terraform/main.tf index 5a057ac05a2eb3d991d21f09884463a7d42824e1..ce74e8924ad615992a1b45c80fa7d0793aa8cbfe 100644 --- a/terraform/main.tf +++ b/terraform/main.tf @@ -13,12 +13,6 @@ required_version = ">= 0.14.0" # Configure the OpenStack Provider provider "openstack" { insecure = true - auth_url = "http://openstack.piacere.digital.tecnalia.dev:5000/" - user_name = "admin" - tenant_name = "admin" - region = "RegionOne" - domain_name = "Default" - password = "PzF1h209CVsRzEV2Ckaeeh7ZlnrO4WAMkifw3v2j" } # Retrieve data @@ -69,7 +63,7 @@ resource "openstack_networking_network_v2" "net1" { # Create network port resource "openstack_networking_port_v2" "net1_networking_port" { name = "net1" - network_id = openstack_networking_network_v2.generic.id + network_id = openstack_networking_network_v2.net1.id admin_state_up = true security_group_ids = [ data.openstack_networking_secgroup_v2.default.id #default flavour id @@ -92,16 +86,11 @@ data "openstack_networking_secgroup_v2" "default" { # Subnet configuration resource "openstack_networking_subnet_v2" "net1_subnet" { name = "net1_subnet" - network_id = openstack_networking_network_v2.generic.id + network_id = openstack_networking_network_v2.net1.id cidr = "16.0.0.0/24" dns_nameservers = ["8.8.8.8", "8.8.8.4"] } -# Network creation -resource "openstack_networking_network_v2" "generic" { - name = "ostack2" -} - # Create router resource "openstack_networking_router_v2" "router" { ## 1router, not parametric @@ -113,7 +102,7 @@ resource "openstack_networking_router_v2" "router" { ## 1router, not parametric # Create ssh keys resource "openstack_compute_keypair_v2" "user1" { - name = "user-test" + name = "integration-test" public_key = "${file("~/.ssh/id_rsa.pub")}" }