1
0
mirror of synced 2025-12-19 18:05:44 -05:00

fix a few issues from the tests. bump version in docs

This commit is contained in:
Rob Morgan
2019-06-25 16:42:31 +02:00
parent 7713a67db3
commit bb152b218d
6 changed files with 52 additions and 52 deletions

View File

@@ -28,7 +28,7 @@ resource "random_id" "name" {
locals {
# If name_override is specified, use that - otherwise use the name_prefix with a random string
instance_name = "${length(var.name_override) == 0 ? format("%s-%s", var.name_prefix, random_id.name.hex) : var.name_override}"
instance_name = length(var.name_override) == 0 ? format("%s-%s", var.name_prefix, random_id.name.hex) : var.name_override
private_network_name = "private-network-${random_id.name.hex}"
private_ip_name = "private-ip-${random_id.name.hex}"
}
@@ -40,18 +40,18 @@ locals {
module "postgres" {
# When using these modules in your own templates, you will need to use a Git URL with a ref attribute that pins you
# to a specific version of the modules, such as the following example:
# source = "github.com/gruntwork-io/terraform-google-sql.git//modules/cloud-sql?ref=v0.1.1"
# source = "github.com/gruntwork-io/terraform-google-sql.git//modules/cloud-sql?ref=v0.2.0"
source = "../../modules/cloud-sql"
project = "${var.project}"
region = "${var.region}"
name = "${local.instance_name}"
db_name = "${var.db_name}"
project = var.project
region = var.region
name = local.instance_name
db_name = var.db_name
engine = "${var.postgres_version}"
machine_type = "${var.machine_type}"
engine = var.postgres_version
machine_type = var.machine_type
master_zone = "${var.master_zone}"
master_zone = var.master_zone
# To make it easier to test this example, we are giving the servers public IP addresses and allowing inbound
# connections from anywhere. In real-world usage, your servers should live in private subnets, only have private IP
@@ -69,16 +69,16 @@ module "postgres" {
enable_failover_replica = true
# Indicate we want read replicas to be created
num_read_replicas = "${var.num_read_replicas}"
read_replica_zones = ["${var.read_replica_zones}"]
num_read_replicas = var.num_read_replicas
read_replica_zones = var.read_replica_zones
# These together will construct the master_user privileges, i.e.
# 'master_user_name'@'master_user_host' IDENTIFIED BY 'master_user_password'.
# These should typically be set as the environment variable TF_VAR_master_user_password, etc.
# so you don't check these into source control."
master_user_password = "${var.master_user_password}"
master_user_password = var.master_user_password
master_user_name = "${var.master_user_name}"
master_user_name = var.master_user_name
master_user_host = "%"
custom_labels = {