Merge branch 'master' of github.com:CodeNow/devops-scripts into setup-playbook-revision

* 'master' of github.com:CodeNow/devops-scripts:
  Change region name
  Added marketing deploy keys
  Updated deploy bucket for marketing.
  Add bucket region for web
  remove epsilon (#605)
  change version (#604)
  Tags
  Remove '-'
  PR comments
  Added postgres connect strings
  Fix osx removal of deamon (#592)
  Container Kill Start
  Add >65000 port for deployment
  Change node version
  Added port options
  Added user content domain var
  PR comments
  Changed names to agreeable-egret
  Added egret and env vars

Author: thejsj

ansible/agreeable-egret.yml

@@ -0,0 +1,11 @@
+---
+- hosts: redis
+- hosts: agreeable-egret
+  vars_files:
+    - group_vars/alpha-agreeable-egret.yml
+  roles:
+  - role: notify
+    tags: [ notify ]
+  - role: builder
+    tags: [ build ]
+  - role: container_kill_start

ansible/delta-hosts/hosts

@@ -59,6 +59,9 @@ delta-app-services
 
 [dock]
 
+[agreeable-egret]
+delta-app-services
+
 [eru]
 delta-app-services
 
@@ -92,6 +95,9 @@ delta-rabbit
 [web]
 delta-app-services
 
+[marketing]
+delta-app-services
+
 [metabase]
 delta-metabase
 
@@ -138,6 +144,7 @@ delta-app-services
 delta-prometheus
 
 [delta:children]
+agreeable-egret
 api
 arithmancy
 bastion

ansible/delta-hosts/variables

@@ -1,3 +1,11 @@
+[agreeable-egret:vars]
+agreeable_egret_port=65520
+egret_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com
+egret_pg_port=5432
+egret_pg_user=egret
+egret_pg_pass=wwHQ5B4RfY9iKS3m
+egret_pg_database=egret
+
 [api_group:vars]
 api_aws_access_key_id=AKIAJWSSSJYUXKNW2ZDA
 api_aws_secret_access_key=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
@@ -140,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
@@ -196,3 +209,4 @@ vpc_id=vpc-864c6be3
 [web:vars]
 web_intercom_id=wqzm3rju
 web_sift_public_key=27e9da5c97
+web_aws_bucket_region=us-west-2

ansible/epsilon-hosts/docks.js

@@ -45,6 +45,9 @@ gamma-consul-c
 [worker]
 gamma-api-worker
 
+[agreeable-egret]
+gamma-app-services
+
 [eru]
 gamma-app-services
 
@@ -81,6 +84,9 @@ gamma-rabbit
 [web]
 gamma-app-services
 
+[marketing]
+gamma-app-services
+
 [redis]
 gamma-redis
 
@@ -128,6 +134,7 @@ gamma-app-services
 gamma-dock-services
 
 [gamma:children]
+agreeable-egret
 api
 arithmancy
 bastion

ansible/epsilon-hosts/hosts

@@ -1,3 +1,11 @@
+[agreeable-egret:vars]
+agreeable_egret_port=65520
+egret_pg_host=gamma-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:32659
+egret_pg_port=32659
+egret_pg_user=egret
+egret_pg_pass=b3UKjxbGblKZtG6c
+egret_pg_database=egret
+
 [api_group:vars]
 api_aws_access_key_id=AKIAIDC4WVMTCGV7KRVQ
 api_aws_secret_access_key=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
@@ -122,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

ansible/gamma-hosts/hosts

@@ -44,6 +44,9 @@ core_file_dir: /docker/app-cores
 ## shared application configs
 ##
 
+# agreeable-egret
+agreeable_egret_hostname: egret.{{ domain }}
+
 #angular
 angular_url: https://app.{{ domain }}
 mixpanel_proxy_url: https://mixpanel.{{ domain }}

ansible/gamma-hosts/variables

@@ -0,0 +1,27 @@
+name: "agreeable-egret"
+
+container_image: "registry.runnable.com/runnable/{{ name }}"
+container_tag: "{{ git_branch }}"
+hosted_ports: ["{{ agreeable_egret_port }}"]
+repo: "[email protected]:CodeNow/{{ name }}.git"
+node_version: "4.3.1"
+npm_version: "3.7.5"
+
+# Exposes egret
+redis_key: "frontend:{{ agreeable_egret_hostname }}"
+is_redis_update_required: 'yes'
+
+# container settings
+container_envs: >
+  -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
+  -e NODE_ENV={{ node_env }}
+  -e RUNNABLE_API_URL={{ api_url }}
+  -e PORT={{ hosted_ports[0] }}
+  -e RUNNABLE_USER_CONTENT_DOMAIN={{ user_content_domain }}
+  -e POSTGRES_CONNECT_STRING=postgres://{{ egret_pg_user }}:{{ egret_pg_pass }}@{{ egret_pg_host }}/{{ egret_pg_database }}
+
+container_run_opts: >
+  -h {{ name }}
+  -d
+  -p {{ hosted_ports[0] }}:{{ hosted_ports[0] }}
+  {{ container_envs }}