Commit 7c1318f0 authored by John Jarvis's avatar John Jarvis

Fix runlist and meta info for the redis vms.

parent 0cfa2ecc
......@@ -780,7 +780,6 @@ module "pubsubbeat" {
names = "${var.pubsubbeats["names"]}"
machine_types = "${var.pubsubbeats["machine_types"]}"
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["pubsubbeat"]}"
......
......@@ -301,7 +301,7 @@ module "redis-cache" {
project = "${var.project}"
public_ports = "${var.public_ports["redis-cache"]}"
region = "${var.region}"
redis_chef_run_list = "\"role[gprd-base-db-redis-server-cache]\""
redis_chef_run_list = "\"role[${var.environment}-base-db-redis-server-cache]\""
redis_count = "${var.node_count["redis-cache"]}"
redis_data_disk_size = 100
redis_data_disk_type = "pd-ssd"
......@@ -766,7 +766,6 @@ module "pubsubbeat" {
names = "${var.pubsubbeats["names"]}"
machine_types = "${var.pubsubbeats["machine_types"]}"
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["pubsubbeat"]}"
......
......@@ -155,8 +155,8 @@ variable "public_ports" {
"git" = []
"mailroom" = []
"pubsubbeat" = []
"redis" = []
"redis-cache" = []
"redis" = [22]
"redis-cache" = [22]
"registry" = []
"sidekiq" = []
"stor" = []
......
......@@ -39,6 +39,10 @@ resource "google_compute_instance" "instance_with_attached_disk" {
"CHEF_RUN_LIST" = "${var.redis_chef_run_list}"
"CHEF_DNS_ZONE_NAME" = "${var.dns_zone_name}"
"CHEF_PROJECT" = "${var.project}"
"CHEF_BOOTSTRAP_BUCKET" = "${var.chef_provision.["bootstrap_bucket"]}"
"CHEF_BOOTSTRAP_KEYRING" = "${var.chef_provision.["bootstrap_keyring"]}"
"CHEF_BOOTSTRAP_KEY" = "${var.chef_provision.["bootstrap_key"]}"
"CHEF_INIT_RUN_LIST" = "${var.chef_init_run_list}"
"GL_PERSISTENT_DISK_PATH" = "${var.persistent_disk_path}"
"GL_FORMAT_DATA_DISK" = "${var.format_data_disk}"
"block-project-ssh-keys" = "${var.block_project_ssh_keys}"
......
......@@ -38,6 +38,10 @@ resource "google_compute_instance" "sentinel_instance_with_attached_disk" {
"CHEF_RUN_LIST" = "${var.sentinel_chef_run_list}"
"CHEF_DNS_ZONE_NAME" = "${var.dns_zone_name}"
"CHEF_PROJECT" = "${var.project}"
"CHEF_BOOTSTRAP_BUCKET" = "${var.chef_provision.["bootstrap_bucket"]}"
"CHEF_BOOTSTRAP_KEYRING" = "${var.chef_provision.["bootstrap_keyring"]}"
"CHEF_BOOTSTRAP_KEY" = "${var.chef_provision.["bootstrap_key"]}"
"CHEF_INIT_RUN_LIST" = "${var.chef_init_run_list}"
"GL_PERSISTENT_DISK_PATH" = "${var.persistent_disk_path}"
"GL_FORMAT_DATA_DISK" = "${var.format_data_disk}"
"block-project-ssh-keys" = "${var.block_project_ssh_keys}"
......
......@@ -9,6 +9,12 @@ variable "bootstrap_version" {
default = 1
}
variable "chef_init_run_list" {
type = "string"
default = ""
description = "run_list for the node in chef that are ran on the first boot only"
}
variable "persistent_disk_path" {
type = "string"
description = "default location for disk mount"
......
......@@ -49,11 +49,6 @@ variable "chef_provision" {
description = "Configuration details for chef server"
}
variable "chef_run_list" {
type = "string"
description = "run_list for the node in chef"
}
variable "dns_zone_name" {
type = "string"
description = "The GCP name of the DNS zone to use for this environment"
......
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