Commit 0d291d43 authored by jtevnan's avatar jtevnan

moved syslog_client to environment aware vault

parent 180d530a
......@@ -230,7 +230,7 @@ module "virtual-machines-external-lb" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab-staging-external-lb"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab-staging-external-lb"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -247,7 +247,7 @@ module "virtual-machines-internal-lb" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg staging-base-lb:backend"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg staging-base-lb:backend"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -264,7 +264,7 @@ module "virtual-machines-postgres" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab-monitor:stg postgres-exporter:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab-monitor:stg postgres-exporter:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -276,7 +276,7 @@ module "virtual-machines-redis" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -284,7 +284,7 @@ module "virtual-machines-redis" {
module "virtual-machines-redis-cache" {
address_prefix = "${module.subnet-redis.address_prefix}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab_consul:stg_client"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab_consul:stg_client"
chef_version = "${var.chef_version}"
environment = "${var.environment}"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
......@@ -314,7 +314,7 @@ module "virtual-machines-elasticsearch" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -331,7 +331,7 @@ module "virtual-machines-pgbouncer" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab-monitor:stg postgres-exporter:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab-monitor:stg postgres-exporter:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -343,7 +343,7 @@ module "virtual-machines-deploy" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......@@ -360,14 +360,14 @@ module "virtual-machines-consul" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-cluster-base"
chef_vaults = "syslog_client:stg gitlab-cluster-base"
gitlab_net_zone_id = "${var.gitlab_net_zone_id}"
}
module "virtual-machines-api" {
address_prefix = "${module.subnet-api.address_prefix}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab_consul:stg_client"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab_consul:stg_client"
chef_version = "${var.chef_version}"
count = 1
environment = "${var.environment}"
......@@ -386,7 +386,7 @@ module "virtual-machines-api" {
module "virtual-machines-git" {
address_prefix = "${module.subnet-git.address_prefix}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab_consul:stg_client"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab_consul:stg_client"
chef_version = "${var.chef_version}"
count = 1
environment = "${var.environment}"
......@@ -405,7 +405,7 @@ module "virtual-machines-git" {
module "virtual-machines-sidekiq" {
address_prefix = "${module.subnet-sidekiq.address_prefix}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab_consul:stg_client"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab_consul:stg_client"
chef_version = "${var.chef_version}"
environment = "${var.environment}"
first_user_password = "${var.first_user_password}"
......@@ -436,7 +436,7 @@ module "virtual-machines-sidekiq" {
module "virtual-machines-web" {
address_prefix = "${module.subnet-web.address_prefix}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab_consul:stg_client"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab_consul:stg_client"
chef_version = "${var.chef_version}"
count = 2
environment = "${var.environment}"
......@@ -465,14 +465,14 @@ module "virtual-machines-registry" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
module "virtual-machines-mailroom" {
address_prefix = "${module.subnet-mailroom.address_prefix}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg gitlab_consul:stg_client"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg gitlab_consul:stg_client"
chef_version = "${var.chef_version}"
count = 1
environment = "${var.environment}"
......@@ -501,7 +501,7 @@ module "virtual-machines-api-internal" {
first_user_username = "${var.first_user_username}"
first_user_password = "${var.first_user_password}"
chef_repo_dir = "${var.chef_repo_dir}"
chef_vaults = "syslog_client gitlab-staging-base:stg"
chef_vaults = "syslog_client:stg gitlab-staging-base:stg"
gitlab_com_zone_id = "${var.gitlab_com_zone_id}"
}
......
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