Merge branch 'tester' into 'master'

Tester

See merge request rrand11/terraform-openstack!6

datasources.tf

-data "openstack_networking_network_v2" "borderrouter" {
- name = "${var.pool}"
+data "openstack_networking_network_v2" "public-network" {
+  name = "${var.public-network-name}"
 }

main.tf

@@ -31,7 +31,7 @@ resource "openstack_networking_subnet_v2" "dmzsubnet" {
 resource "openstack_networking_router_v2" "borderrouter" {
   name                = "borderrouter"
   admin_state_up      = "true"
-  external_network_id = "${data.openstack_networking_network_v2.borderrouter.id}"
+  external_network_id = "${data.openstack_networking_network_v2.public-network.id}"
 }
 
 resource "openstack_networking_router_interface_v2" "borderrouter" {
@@ -58,7 +58,7 @@ resource "openstack_networking_subnet_v2" "clustersubnet" {
 
 # defines where floating ip will come from using variable from vars.tf
 resource "openstack_networking_floatingip_v2" "ip_pool" {
-  pool = "${var.pool}"
+  pool = "${var.public-network-name}"
 }
 
 # creates details for the OHPC instance using variables defined in vars.tf

vars.tf

@@ -6,6 +6,7 @@ variable "flavor" {
   default = "m1.medium"
 }
 
-variable "pool" {
+variable "public-network-name" {
   default = "bright-external-flat-externalnet"
 }
+