Merge branch 'master' into new-swarm-certs

Author: Anandkumar Patel

README.md

@@ -60,7 +60,7 @@ ansible-playbook -i ./[stage-hosts, prod-hosts] [appname].yml -t deploy -e git_b
 This will redeploy the current deploy without rebuilding
 
 ```
-ansible-playbook -i./[stage-hosts, prod-hosts] [appname].yml -e git_branch=some-branch-name -e build_args=--no-cache
+ansible-playbook -i ./[stage-hosts, prod-hosts] [appname].yml -e git_branch=some-branch-name -e build_args=--no-cache
 ```
 
 deploy latest version of the branch

ansible/beta-hosts/hosts

@@ -34,6 +34,9 @@ beta-api
 [eru]
 beta-services
 
+[fluffy]
+beta-services
+
 [navi]
 beta-navi
 
@@ -93,6 +96,7 @@ bastion
 charon
 docks
 eru
+fluffy
 hipache
 khronos
 link

ansible/beta-hosts/variables

@@ -4,7 +4,6 @@ api_aws_secret_access_key=A6XOpeEElvvIulfAzVLohqKtpKij5ZE8h0FFx0Jn
 api_github_client_id=baa5c868b6d17d7ae002
 api_github_client_secret=ad4f8527ae98d7eea15a32ee5abbead5c9a25abc
 api_github_deploy_keys_bucket=runnable.deploykeys.production-beta
-api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
 api_mongo_auth=api:oW4c7x9Wiv28oiNBy2Bc
 api_mongo_database=beta
@@ -60,3 +59,4 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.20.1.55
 swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnablecloud.com
+api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af

ansible/fluffy.yml

@@ -0,0 +1,12 @@
+---
+- hosts: redis
+
+- hosts: fluffy
+  vars_files:
+    - "group_vars/alpha-fluffy.yml"
+  roles:
+  - { role: notify, tags: "notify" }
+  - { role: redis_key, tags: ["setup", "redis_key"] }
+  - { role: builder, tags: "build" }
+  - { role: container_start, tags: "deploy" }
+

ansible/gamma-hosts/variables

@@ -4,7 +4,6 @@ api_aws_secret_access_key=A6XOpeEElvvIulfAzVLohqKtpKij5ZE8h0FFx0Jn
 api_github_client_id=b6072dc57062faca7fcb
 api_github_client_secret=ba73a9294dc4bfaa7ed02ba187f73918506e4293
 api_github_deploy_keys_bucket=runnable.deploykeys.production-beta
-api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af
 api_mixpanel_app_id=c41affa4b08818443365c526cbb51606
 api_mongo_auth=api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
 api_mongo_database=gamma
@@ -70,3 +69,4 @@ rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
 registry_host=10.4.4.82
 swarm_token=d363b783f03a845a2c82b081bfe8443e
 user_content_domain=runnable.ninja
+api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af

ansible/group_vars/all.yml

@@ -34,9 +34,9 @@ loggly_username: ops
 
 # api
 api_github_hook_secret: 3V3RYTHINGisAW3S0ME!
+api_hostname: api.{{ domain }}
 api_neo4j_port: 7474
 api_neo4j_protocol: http://
-api_hostname: api.{{ domain }}
 api_port: 80
 
 # astral
@@ -69,6 +69,10 @@ docker_port: 4242
 eru_port: 57831
 eru_hostname: "admin.{{ domain }}"
 
+# fluffy
+fluffy_port: 80
+fluffy_hostname: "fluffy.{{ domain }}"
+
 # mavis
 mavis_hostname: "mavis.{{ domain }}"
 mavis_port: 3000

ansible/group_vars/alpha-detention.yml

@@ -16,8 +16,10 @@ dockerfile_post_install_commands: [
 ]
 
 container_envs: >
-  -e NODE_ENV={{ node_env }}
   -e ABSOLUTE_URL={{ detention_hostname }}
+  -e API_HOSTNAME={{ api_hostname }}
+  -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
+  -e NODE_ENV={{ node_env }}
   -e PORT={{ hosted_ports[0] }}
 
 container_run_opts: >

ansible/group_vars/alpha-fluffy.yml

@@ -0,0 +1,30 @@
+name: "fluffy"
+
+container_image: "registry.runnable.com/runnable/{{ name }}"
+container_tag: "{{ git_branch }}"
+repo: "git@github.com:CodeNow/{{ name }}.git"
+hosted_ports: ["{{ fluffy_port }}"]
+node_version: "4.2.2"
+npm_version: "2.1.18"
+
+# for redis
+redis_key: "frontend:{{ fluffy_hostname }}"
+is_redis_update_required: 'yes'
+
+dockerfile_post_install_commands: [
+ "git clone -b master --single-branch git@github.com:CodeNow/devops-scripts /opt/devops-scripts",
+ "git clone -b bin-bash --single-branch git@github.com:CodeNow/docks-cli /opt/docks-cli",
+ "cd /opt/docks-cli && npm install && npm link ."
+]
+
+# container settings
+container_envs: >
+  -e PORT={{ hosted_ports[0] }}
+  -e NODE_ENV={{ node_env }}
+  -e DEVOPS_SCRIPTS_PATH="opt/devops-scripts"
+
+container_run_opts: >
+  -h {{ name }}
+  -d
+  -P
+  {{container_envs}}

ansible/prod-hosts/hosts

@@ -40,6 +40,9 @@ alpha-api
 [eru]
 alpha-api-old
 
+[fluffy]
+alpha-api-old
+
 [navi]
 alpha-navi
 
@@ -100,6 +103,7 @@ charon
 detention
 docks
 eru
+fluffy
 hipache
 hubot
 khronos

ansible/prod-hosts/variables

@@ -60,3 +60,4 @@ rabbit_username=a4c1ac709c3bc685a6665fc1d23d737d
 registry_host=10.0.1.254
 swarm_token=40ec138a1b478aaf84aca2a1c21c70fe
 user_content_domain=runnableapp.com
+api_hello_runnable_github_token=88ddc423c2312d02a8bbcaad76dd4c374a30e4af