Commit 35090fee authored by Ryan Randles Jones's avatar Ryan Randles Jones
Browse files

changed all vars to match changed in vars file

parent e9867ed5
resource "openstack_compute_keypair_v2" "keypair" {
name = "${var.keypair-name}"
public_key = "${file(var.ssh_public_key)}"
public_key = "${file(var.ssh-public-key)}"
}
#local variable for ssh connect to ohpc
......@@ -8,14 +8,14 @@ resource "openstack_compute_keypair_v2" "keypair" {
# connection = {
# host = "${format("164.111.161.%s", element(split(".", openstack_networking_floatingip_v2.ip_pool.address),3))}"
# user = "centos"
# private_key = "${file(var.ssh_private_key)}"
# private_key = "${file(var.ssh-private-key)}"
# }
#}
# creates dmznet
resource "openstack_networking_network_v2" "external_net" {
name = "${var.external-net}"
admin_state_up = "${var.admin_state_up}"
admin_state_up = "${var.admin-state-up}"
}
resource "openstack_networking_subnet_v2" "external_subnet" {
......@@ -30,7 +30,7 @@ resource "openstack_networking_subnet_v2" "external_subnet" {
# defines the router borderrouter using floating ip defined in datasources.tf to create the external network id
resource "openstack_networking_router_v2" "router" {
name = "${var.router}"
admin_state_up = "${var.admin_state_up}"
admin_state_up = "${var.admin-state-up}"
external_network_id = "${data.openstack_networking_network_v2.public-network.id}"
}
......@@ -43,7 +43,7 @@ resource "openstack_networking_router_interface_v2" "router" {
# creates clusternet
resource "openstack_networking_network_v2" "internal_net" {
name = "${var.internal-net}"
admin_state_up = "${var.admin_state_up}"
admin_state_up = "${var.admin-state-up}"
}
# creates clustersubnet
# cidr is the subnet range (that subnet range and dns nameservers from the network create file in feat-openstack)
......@@ -86,9 +86,9 @@ resource "openstack_compute_floatingip_associate_v2" "ohpc" {
# defines ssh connection
connection {
host = "${format("var.host_prefix", element(split(".", openstack_networking_floatingip_v2.ip_pool.address),3))}"
user = "${var.ohpc_user}"
private_key = "${file(var.ssh_private_key)}"
host = "${format("var.host-prefix", element(split(".", openstack_networking_floatingip_v2.ip_pool.address),3))}"
user = "${var.ohpc-user}"
private_key = "${file(var.ssh-private-key)}"
}
# installs programs
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment