From 945f25548076a2989393c2caa8c0f749bc87f398 Mon Sep 17 00:00:00 2001 From: Myztiq Date: Thu, 2 Mar 2017 15:04:10 -0800 Subject: [PATCH 1/2] Updated deploy bucket for marketing. --- ansible/delta-hosts/variables | 1 + ansible/gamma-hosts/variables | 1 + ansible/group_vars/alpha-marketing.yml | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index 11d5d1ea..395d3e09 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -174,6 +174,7 @@ vault_auth_token=578c9767-5af8-8490-0954-5d330f27b088 vault_token_01=0d324dc7d4cbd94790fd08809d06fb1e28e21e185910081c7646e3e49924f6ed01 vault_token_02=42dc8a69df174e77eb47a63b6ef4709bec57101cb1bff11a71c91b73b8bc046102 vault_token_03=47f3cb74f5374fa3c51c90fd25e3d4cc851034de97584995fce5fc5382342f1f03 +marketing_bucket=runnable.com [ec2:vars] aws_custid=437258487404 diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index e2e4b8ba..cd288675 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -154,6 +154,7 @@ vault_auth_token=f9a39e92-99f3-66a0-a27d-a6e07717d30d vault_token_01=2c0be2adf99931bc9ed443000e87bbcd0ef096dddc79f6add97ebe8fa7e93d2c05 vault_token_02=3489b87c913058740537bbbd4503f3720d74f7cb0f4e0c30a9436e1e52a18d7003 vault_token_03=ac4e1e9800cbf77283298d08172a2f0e46d0b7cbc457c47788d04768af12584a02 +marketing_bucket=runnable-gamma.com [ec2:vars] aws_custid=437258487404 diff --git a/ansible/group_vars/alpha-marketing.yml b/ansible/group_vars/alpha-marketing.yml index 94e57d3b..cb8808c3 100644 --- a/ansible/group_vars/alpha-marketing.yml +++ b/ansible/group_vars/alpha-marketing.yml @@ -12,7 +12,7 @@ dockerfile_enviroment: [ "AWS_ACCESS_KEY {{ aws_access_key }}", "AWS_SECRET_KEY {{ aws_secret_key }}", "ANGULAR_URL {{ angular_url }}", - "AWS_BUCKET {{ domain }}", + "AWS_BUCKET {{ marketing_bucket }}", "NODE_ENV {{ node_env }}" ] From 6bbbeafa47fd9cc0fcf3452145ad160cdcdf7aa4 Mon Sep 17 00:00:00 2001 From: Myztiq Date: Thu, 2 Mar 2017 16:01:52 -0800 Subject: [PATCH 2/2] Added marketing deploy keys --- ansible/delta-hosts/hosts | 3 +++ ansible/delta-hosts/variables | 6 +++++- ansible/gamma-hosts/hosts | 3 +++ ansible/gamma-hosts/variables | 6 +++++- ansible/group_vars/alpha-marketing.yml | 5 +++-- ansible/marketing.yml | 2 +- 6 files changed, 20 insertions(+), 5 deletions(-) diff --git a/ansible/delta-hosts/hosts b/ansible/delta-hosts/hosts index 36d63e0e..92536b47 100644 --- a/ansible/delta-hosts/hosts +++ b/ansible/delta-hosts/hosts @@ -95,6 +95,9 @@ delta-rabbit [web] delta-app-services +[marketing] +delta-app-services + [metabase] delta-metabase diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index 395d3e09..cc6d2ebe 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -148,6 +148,11 @@ vault_aws_access_key_id=AKIAJ7R4UIM45KH2WGWQ vault_aws_secret_key=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 vault_aws_region=us-east-1 +[marketing:vars] +marketing_bucket=runnable.com +marketing_aws_access_key=AKIAIPPPY2JIOHX7QVCA +marketing_aws_secret_key=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 + [delta:vars] ansible_ssh_private_key_file=~/.ssh/delta.pem api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af @@ -174,7 +179,6 @@ vault_auth_token=578c9767-5af8-8490-0954-5d330f27b088 vault_token_01=0d324dc7d4cbd94790fd08809d06fb1e28e21e185910081c7646e3e49924f6ed01 vault_token_02=42dc8a69df174e77eb47a63b6ef4709bec57101cb1bff11a71c91b73b8bc046102 vault_token_03=47f3cb74f5374fa3c51c90fd25e3d4cc851034de97584995fce5fc5382342f1f03 -marketing_bucket=runnable.com [ec2:vars] aws_custid=437258487404 diff --git a/ansible/gamma-hosts/hosts b/ansible/gamma-hosts/hosts index f30216cf..7feb4a76 100644 --- a/ansible/gamma-hosts/hosts +++ b/ansible/gamma-hosts/hosts @@ -84,6 +84,9 @@ gamma-rabbit [web] gamma-app-services +[marketing] +gamma-app-services + [redis] gamma-redis diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables index cd288675..2179f833 100644 --- a/ansible/gamma-hosts/variables +++ b/ansible/gamma-hosts/variables @@ -130,6 +130,11 @@ vault_aws_access_key_id=AKIAJ7R4UIM45KH2WGWQ vault_aws_secret_key=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 vault_aws_region=us-east-1 +[marketing:vars] +marketing_bucket=runnable-gamma.com +marketing_aws_access_key=AKIAICIWKIZEQCMDXLEA +marketing_aws_secret_key=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 + [gamma:vars] ansible_ssh_private_key_file=~/.ssh/gamma.pem api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af @@ -154,7 +159,6 @@ vault_auth_token=f9a39e92-99f3-66a0-a27d-a6e07717d30d vault_token_01=2c0be2adf99931bc9ed443000e87bbcd0ef096dddc79f6add97ebe8fa7e93d2c05 vault_token_02=3489b87c913058740537bbbd4503f3720d74f7cb0f4e0c30a9436e1e52a18d7003 vault_token_03=ac4e1e9800cbf77283298d08172a2f0e46d0b7cbc457c47788d04768af12584a02 -marketing_bucket=runnable-gamma.com [ec2:vars] aws_custid=437258487404 diff --git a/ansible/group_vars/alpha-marketing.yml b/ansible/group_vars/alpha-marketing.yml index cb8808c3..a97aadca 100644 --- a/ansible/group_vars/alpha-marketing.yml +++ b/ansible/group_vars/alpha-marketing.yml @@ -9,10 +9,11 @@ do_not_push: yes dockerfile_enviroment: [ "API_URL https://{{ api_hostname }}", - "AWS_ACCESS_KEY {{ aws_access_key }}", - "AWS_SECRET_KEY {{ aws_secret_key }}", + "AWS_ACCESS_KEY {{ marketing_aws_access_key }}", + "AWS_SECRET_KEY {{ marketing_aws_secret_key }}", "ANGULAR_URL {{ angular_url }}", "AWS_BUCKET {{ marketing_bucket }}", + "AWS_REGION {{ web_aws_bucket_region | default('us-standard') }}", "NODE_ENV {{ node_env }}" ] diff --git a/ansible/marketing.yml b/ansible/marketing.yml index 3403b7d2..64a8a07b 100644 --- a/ansible/marketing.yml +++ b/ansible/marketing.yml @@ -1,5 +1,5 @@ --- -- hosts: web +- hosts: marketing vars_files: - "group_vars/alpha-marketing.yml" roles: