don't use LB_SA CI var, remote_state output only

This commit is contained in:
nitramiz 2019-09-06 15:33:25 -07:00
parent a0ac23fcef
commit 12f994fa2d
No known key found for this signature in database
GPG Key ID: 2352C35346C5D534
2 changed files with 2 additions and 6 deletions

View File

@ -83,7 +83,6 @@ plan_satapi:
-var "public_bucket_url=$PUBLIC_BUCKET_URL"
-var "private_bucket=$PRIVATE_BUCKET"
-var "letsencrypt_email=$LE_EMAIL"
-var "lb_svc_acct=$LB_SA_STAGING"
-var "pguser=$PGUSER"
-var "pgpass=$PGPASS"
-var "charge_token=$CHARGE_TOKEN"
@ -280,7 +279,6 @@ plan_staging_testnet:
-var "public_bucket_url=$PUBLIC_BUCKET_URL"
-var "private_bucket=$PRIVATE_BUCKET"
-var "letsencrypt_email=$LE_EMAIL"
-var "lb_svc_acct=$LB_SA_STAGING"
-var "pguser=$PGUSER"
-var "pgpass=$PGPASS"
-var "charge_token=$CHARGE_TOKEN"
@ -310,7 +308,6 @@ deploy_staging_testnet:
-var "public_bucket_url=$PUBLIC_BUCKET_URL"
-var "private_bucket=$PRIVATE_BUCKET"
-var "letsencrypt_email=$LE_EMAIL"
-var "lb_svc_acct=$LB_SA_STAGING"
-var "pguser=$PGUSER"
-var "pgpass=$PGPASS"
-var "charge_token=$CHARGE_TOKEN"
@ -318,7 +315,7 @@ deploy_staging_testnet:
-var "k8s_autossh_lb=$GKE_LB"
-input=false -auto-approve)
# Tag with testnet_prod_v.* to plan testnet to production (e.g. prod_v0.1.1)
# Tag with testnet_prod_v.* to plan testnet to production (e.g. testnet_prod_v0.1.1)
plan_production_testnet:
stage: plan
only:
@ -368,7 +365,6 @@ deploy_production_testnet:
-var "public_bucket_url=$PUBLIC_BUCKET_URL"
-var "private_bucket=$PRIVATE_BUCKET"
-var "letsencrypt_email=$LE_EMAIL"
-var "lb_svc_acct=$LB_SA"
-var "pguser=$PGUSER"
-var "pgpass=$PGPASS"
-var "charge_token=$CHARGE_TOKEN"

View File

@ -67,6 +67,7 @@ module "blc-testnet" {
certbot_docker = var.certbot_docker
net = "testnet"
env = local.env
lb_svc_acct = data.terraform_remote_state.blc-mainnet.outputs.lb_svc_acct
ssh_key_net = "_testnet"
create_resources = local.create_testnet
@ -79,7 +80,6 @@ module "blc-testnet" {
prom_service_acct = var.prom_service_acct
opsgenie_key = var.opsgenie_key
rpcpass = var.rpcpass
lb_svc_acct = var.lb_svc_acct
pguser = var.pguser
pgpass = var.pgpass
charge_token = var.charge_token