Merge pull request #636 from CodeNow/add-web-and-enterprise-sign-in

thejsj · web-flow · commit 341f4ce6631b · 2017-04-20T11:02:47.000-07:00
Add web and enterprise sign in
diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
@@ -176,12 +176,13 @@ pg_pass=59a5524e-a772-11e5-bedc-1bdc0db458b3
 pg_user=astral
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
-registry_host=10.8.4.126
 user_content_domain=runnableapp.com
 vault_auth_token=578c9767-5af8-8490-0954-5d330f27b088
 vault_token_01=0d324dc7d4cbd94790fd08809d06fb1e28e21e185910081c7646e3e49924f6ed01
 vault_token_02=42dc8a69df174e77eb47a63b6ef4709bec57101cb1bff11a71c91b73b8bc046102
 vault_token_03=47f3cb74f5374fa3c51c90fd25e3d4cc851034de97584995fce5fc5382342f1f03
+registry_username=runnable+deltapush
+registry_token=4PX2AU9QIJSCDLZEXILYX6ZP2RCXY1HR10WVZKWVR0JW8DS5IIY87D96V0RACMK5
 
 [ec2:vars]
 aws_custid=437258487404
diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
@@ -159,12 +159,14 @@ pg_host=gamma-infrastructure-db.cnksgdqarobf.us-west-2.rds.amazonaws.com
 pg_pass=e9G7zYRCxYmxG9HQ8J9x2BDB
 rabbit_password=wKK7g7NWKpQXEeSzyWB7mIpxZIL8H2mDSf3Q6czR3Vk
 rabbit_username=o2mdLh9N9Ke2GzhoK8xsruYPhIQFN7iEL44dQJoq7OM
-registry_host=10.4.4.82
 user_content_domain=runnable.ninja
 vault_auth_token=f9a39e92-99f3-66a0-a27d-a6e07717d30d
 vault_token_01=2c0be2adf99931bc9ed443000e87bbcd0ef096dddc79f6add97ebe8fa7e93d2c05
 vault_token_02=3489b87c913058740537bbbd4503f3720d74f7cb0f4e0c30a9436e1e52a18d7003
 vault_token_03=ac4e1e9800cbf77283298d08172a2f0e46d0b7cbc457c47788d04768af12584a02
+registry_host=quay.io
+registry_username=runnable+gammapull
+registry_token=RV8IZ818DDRUMUJNNDDPS0AE4HJXBSFTDSC06X4COUMQZWDZD628IXB0TOO5UL79
 
 [ec2:vars]
 aws_custid=437258487404
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
@@ -6,6 +6,8 @@ pager_duty_key: testkey
 # registry settings
 registry_env: prod
 registry_port: 80
+registry_host: "quay.io"
+quay_api_token: QB9UzzNhwClqMgRyMgNGrSGLdUYZPJLJALdcpKRa
 
 # for docker stop old container
 stop_time: 5
diff --git a/ansible/group_vars/alpha-agreeable-egret.yml b/ansible/group_vars/alpha-agreeable-egret.yml
@@ -1,6 +1,6 @@
 name: "agreeable-egret"
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 hosted_ports: ["{{ agreeable_egret_port }}"]
 repo: "git@github.com:CodeNow/{{ name }}.git"
diff --git a/ansible/group_vars/alpha-api.yml b/ansible/group_vars/alpha-api.yml
@@ -1,6 +1,6 @@
 name: api
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 
 hosted_ports: [ "{{ api_port }}" ]
 
diff --git a/ansible/group_vars/alpha-arithmancy.yml b/ansible/group_vars/alpha-arithmancy.yml
@@ -1,6 +1,6 @@
 name: "arithmancy"
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.2.2"
diff --git a/ansible/group_vars/alpha-big-poppa-http.yml b/ansible/group_vars/alpha-big-poppa-http.yml
@@ -1,6 +1,6 @@
 name: big-poppa-http
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 hosted_ports: ["{{ big_poppa_port }}"]
 repo: "git@github.com:CodeNow/big-poppa.git"
diff --git a/ansible/group_vars/alpha-big-poppa-worker.yml b/ansible/group_vars/alpha-big-poppa-worker.yml
@@ -1,6 +1,6 @@
 name: big-poppa-worker
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/big-poppa.git"
 node_version: 4.4.7
diff --git a/ansible/group_vars/alpha-clio.yml b/ansible/group_vars/alpha-clio.yml
@@ -1,6 +1,6 @@
 name: clio
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 hosted_ports: ["{{ clio_port }}"]
 repo: git@github.com:CodeNow/{{ name }}.git
diff --git a/ansible/group_vars/alpha-consul.yml b/ansible/group_vars/alpha-consul.yml
@@ -6,7 +6,7 @@ db_path: /etc/consul.d
 # for container_kill_start
 pause_length_minutes: 3
 
-container_image: runnable/consul
+container_image: "{{ registry_host }}/runnable/consul"
 container_tag: v0.6.3
 
 container_run_opts: >
diff --git a/ansible/group_vars/alpha-cream-http.yml b/ansible/group_vars/alpha-cream-http.yml
@@ -1,6 +1,6 @@
 name: cream-http
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 hosted_ports: ["{{ cream_port }}"]
 repo: "git@github.com:CodeNow/cream.git"
diff --git a/ansible/group_vars/alpha-cream-worker.yml b/ansible/group_vars/alpha-cream-worker.yml
@@ -1,6 +1,6 @@
 name: cream-worker
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/cream.git"
 node_version: 4.5.0
diff --git a/ansible/group_vars/alpha-deployer.yml b/ansible/group_vars/alpha-deployer.yml
@@ -1,7 +1,7 @@
 ---
 name: deployer
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/devops-scripts.git
 
diff --git a/ansible/group_vars/alpha-detention.yml b/ansible/group_vars/alpha-detention.yml
@@ -1,6 +1,6 @@
 name: "detention"
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 hosted_ports: ["{{ detention_port }}"]
diff --git a/ansible/group_vars/alpha-docker-listener.yml b/ansible/group_vars/alpha-docker-listener.yml
@@ -1,6 +1,6 @@
 name: docker-listener
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.2.2"
diff --git a/ansible/group_vars/alpha-drake-http.yml b/ansible/group_vars/alpha-drake-http.yml
@@ -1,6 +1,6 @@
 name: drake-http
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/drake.git"
 hosted_ports: ["{{ drake_port }}"]
diff --git a/ansible/group_vars/alpha-drake-worker.yml b/ansible/group_vars/alpha-drake-worker.yml
@@ -1,6 +1,6 @@
 name: drake-worker
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/drake.git"
 node_version: "4.4.7"
diff --git a/ansible/group_vars/alpha-enterprise-sign-in.yml b/ansible/group_vars/alpha-enterprise-sign-in.yml
@@ -1,6 +1,6 @@
 name: "enterprise-sign-in"
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.8.0"
diff --git a/ansible/group_vars/alpha-eru.yml b/ansible/group_vars/alpha-eru.yml
@@ -1,7 +1,7 @@
 ---
 name: eru
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: [ "5501", "5502" ]
diff --git a/ansible/group_vars/alpha-fluffy.yml b/ansible/group_vars/alpha-fluffy.yml
@@ -1,6 +1,6 @@
 name: "fluffy"
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 hosted_ports: ["{{ fluffy_port }}"]
diff --git a/ansible/group_vars/alpha-github-varnish.yml b/ansible/group_vars/alpha-github-varnish.yml
@@ -1,7 +1,7 @@
 ---
 name: github-varnish
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
 
diff --git a/ansible/group_vars/alpha-hipache.yml b/ansible/group_vars/alpha-hipache.yml
@@ -1,7 +1,7 @@
 # container_kill_start settings
 name: hipache
 
-container_image: registry.runnable.com/runnable/hipache
+container_image: "{{ registry_host }}/runnable/hipache"
 container_tag: latest
 hosted_ports: [ 80, 443 ]
 
diff --git a/ansible/group_vars/alpha-image-builder.yml b/ansible/group_vars/alpha-image-builder.yml
@@ -1,7 +1,7 @@
 app_name: image-builder
 name: "{{ app_name }}"
 # namespace (can include "registry.runnable.com:")
-image_builder_docker_namespace: runnable/image-builder
+image_builder_docker_namespace: "{{ registry_host }}/runnable/image-builder"
 app_repo: git@github.com:CodeNow/{{ app_name }}.git
 
 # consul values
diff --git a/ansible/group_vars/alpha-khronos.yml b/ansible/group_vars/alpha-khronos.yml
@@ -1,6 +1,6 @@
 name: khronos
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.4.7"
diff --git a/ansible/group_vars/alpha-link.yml b/ansible/group_vars/alpha-link.yml
@@ -1,6 +1,6 @@
 name: link
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
 node_version: "4.2.1"
diff --git a/ansible/group_vars/alpha-marketing.yml b/ansible/group_vars/alpha-marketing.yml
@@ -1,6 +1,6 @@
 name: "runnable.com"
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.3.1"
diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml
@@ -1,6 +1,6 @@
 name: navi
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: [ "{{ navi_http_port }}" ]
diff --git a/ansible/group_vars/alpha-optimus.yml b/ansible/group_vars/alpha-optimus.yml
@@ -1,6 +1,6 @@
 name: optimus
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: ["{{ optimus_port }}"]
diff --git a/ansible/group_vars/alpha-palantiri.yml b/ansible/group_vars/alpha-palantiri.yml
@@ -1,6 +1,6 @@
 name: "palantiri"
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.2.2"
diff --git a/ansible/group_vars/alpha-pheidi.yml b/ansible/group_vars/alpha-pheidi.yml
@@ -1,6 +1,6 @@
 name: pheidi
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.2.2"
diff --git a/ansible/group_vars/alpha-proxy-socket-server.yml b/ansible/group_vars/alpha-proxy-socket-server.yml
@@ -1,7 +1,7 @@
 ---
 name: nginx
 
-docker_image: runnable/sticky-nginx
+docker_image: "{{ registry_host }}/runnable/sticky-nginx"
 docker_image_version: v1.8.1
 
 docker_restart_command: kill -s SIGHUP
diff --git a/ansible/group_vars/alpha-redis-tls.yml b/ansible/group_vars/alpha-redis-tls.yml
@@ -1,7 +1,7 @@
 name: redis
 
 # container_kill_start settings
-container_image: runnable/redis-stunnel
+container_image: "{{ registry_host }}/runnable/redis-stunnel"
 container_tag: v0.1.0
 container_run_opts: >
   --link redis:redis
diff --git a/ansible/group_vars/alpha-sauron.yml b/ansible/group_vars/alpha-sauron.yml
@@ -1,6 +1,6 @@
 name: sauron
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "4.2.2"
diff --git a/ansible/group_vars/alpha-shiva.yml b/ansible/group_vars/alpha-shiva.yml
@@ -1,5 +1,5 @@
 name: shiva
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: git@github.com:CodeNow/astral.git
 node_version: "4.2.1"
@@ -21,7 +21,6 @@ container_envs: >
   -e AWS_ACCESS_KEY_ID={{ aws_access_key_id }}
   -e AWS_SECRET_ACCESS_KEY={{ aws_secret_access_key }}
   -e NODE_ENV={{ node_env }}
-  -e REGISTRY_HOST={{ registry_host }}
   -e ROLLBAR_KEY={{ shiva_rollbar_token }}
   -e DOCKER_PORT={{ docker_port }}
 
diff --git a/ansible/group_vars/alpha-socket-server.yml b/ansible/group_vars/alpha-socket-server.yml
@@ -1,6 +1,6 @@
 name: api-socket-server
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 
 hosted_ports: [ "{{ api_port }}" ]
 
diff --git a/ansible/group_vars/alpha-swarm-manager-metrics.yml b/ansible/group_vars/alpha-swarm-manager-metrics.yml
@@ -2,7 +2,7 @@
 name: swarm-cloudwatch-reporter
 
 repo: git@github.com:CodeNow/furry-cactus.git
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 node_version: "4.4.7"
 npm_version: 3
diff --git a/ansible/group_vars/alpha-vault.yml b/ansible/group_vars/alpha-vault.yml
@@ -3,7 +3,7 @@ name: vault
 # for database role
 db_path: /opt/runnable/vault
 
-container_image: runnable/vault
+container_image: "{{ registry_host }}/runnable/vault"
 container_tag: v0.5.1
 
 container_run_opts: >
diff --git a/ansible/group_vars/alpha-web.yml b/ansible/group_vars/alpha-web.yml
@@ -1,6 +1,6 @@
 name: "runnable-angular"
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 container_tag: "{{ git_branch }}"
 repo: "git@github.com:CodeNow/{{ name }}.git"
 node_version: "0.10.38"
diff --git a/ansible/group_vars/alpha-workers.yml b/ansible/group_vars/alpha-workers.yml
@@ -1,6 +1,6 @@
 name: api-worker
 
-container_image: registry.runnable.com/runnable/{{ name }}
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 
 memory_hard_limit: 1g
 
diff --git a/ansible/group_vars/node-base.yml b/ansible/group_vars/node-base.yml
@@ -1,4 +1,4 @@
 name: "node_base"
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: "{{ registry_host }}/runnable/{{ name }}"
 dockerfile: "node_base/Dockerfile"
 container_tag: "latest"
diff --git a/ansible/roles/builder/meta/main.yml b/ansible/roles/builder/meta/main.yml
@@ -0,0 +1,3 @@
+---
+dependencies:
+  - { role: docker_squash }
diff --git a/ansible/roles/builder/tasks/main.yml b/ansible/roles/builder/tasks/main.yml
diff --git a/ansible/roles/squash_image/tasks/main.yml b/ansible/roles/squash_image/tasks/main.yml
diff --git a/ansible/roles/wait_for_container_exit/tasks/main.yml b/ansible/roles/wait_for_container_exit/tasks/main.yml
