Commit 365802c6 authored by John Jarvis's avatar John Jarvis

Jarv/bootstrap mount

parent e2798412
......@@ -213,23 +213,24 @@ module "geo-postgres" {
##################################
module "redis" {
attach_data_disk = true
data_disk_size = 100
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
chef_run_list = "${var.empty_chef_run_list}"
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
project = "${var.project}"
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
source = "../../modules/google/generic-stor"
tier = "db"
vpc = "${module.network.self_link}"
attach_data_disk = true
bootstrap_version = 3
data_disk_size = 100
data_disk_type = "pd-ssd"
chef_provision = "${var.chef_provision}"
chef_run_list = "\"role[${var.environment}-base-db-redis-server-single]\""
dns_zone_name = "${var.dns_zone_name}"
environment = "${var.environment}"
ip_cidr_range = "${var.subnetworks["redis"]}"
machine_type = "${var.machine_types["redis"]}"
name = "redis"
node_count = "${var.node_count["redis"]}"
project = "${var.project}"
public_ports = "${var.public_ports["redis"]}"
region = "${var.region}"
source = "../../modules/google/generic-stor"
tier = "db"
vpc = "${module.network.self_link}"
}
module "redis-cache" {
......
......@@ -23,7 +23,8 @@ done
# Lookup consul's service endpoint
apt-get install jq -y -q
# If unset, treat as false (do not format)
# default to false, force a reformat even if there is an existing
# Linux filesystem
GL_FORMAT_DATA_DISK=${GL_FORMAT_DATA_DISK:-false}
if [[ -b /dev/sdb && ("true" == "${GL_FORMAT_DATA_DISK}" || $(file -sL /dev/sdb) != *Linux*) ]]; then
......
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