Updating consul for gprd.

b0da3934 · John Jarvis · 6edda712 · b0da3934
Commit b0da3934 authored Feb 28, 2018 by John Jarvis
Hide whitespace changes
Inline Side-by-side

Showing with 15 additions and 14 deletions

environments/gprd/main.tf environments/gprd/main.tf +15 -14

No files found.
--- a/environments/gprd/main.tf
+++ b/environments/gprd/main.tf
@@ -451,20 +451,21 @@ module "google_load_balancers" {
 ##################################

 module "consul" {
-  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["consul"]}"
-  machine_type   = "${var.machine_types["consul"]}"
-  name           = "consul"
-  node_count     = "${var.node_count["consul"]}"
-  project        = "${var.project}"
-  public_ports   = "${var.public_ports["consul"]}"
-  region         = "${var.region}"
-  source         = "../../modules/google/generic-nodisk"
-  tier           = "inf"
-  vpc            = "${module.network.self_link}"
+  bootstrap_version = 3
+  chef_provision    = "${var.chef_provision}"
+  chef_run_list     = "\"role[gprd-infra-consul]\""
+  dns_zone_name     = "${var.dns_zone_name}"
+  environment       = "${var.environment}"
+  ip_cidr_range     = "${var.subnetworks["consul"]}"
+  machine_type      = "${var.machine_types["consul"]}"
+  name              = "consul"
+  node_count        = "${var.node_count["consul"]}"
+  project           = "${var.project}"
+  public_ports      = "${var.public_ports["consul"]}"
+  region            = "${var.region}"
+  source            = "../../modules/google/generic-nodisk"
+  tier              = "inf"
+  vpc               = "${module.network.self_link}"
 }

 ##################################