From f9148e9e1919486eec64da66c978389f83b8fc52 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 14:57:36 -0700
Subject: [PATCH 01/11] Added keymaker configurations.

---
 ansible/delta-hosts/variables                |  6 +++
 ansible/gamma-hosts/variables                |  5 ++
 ansible/group_vars/all.yml                   |  7 +++
 ansible/group_vars/alpha-keymaker-base.yml   | 52 ++++++++++++++++++++
 ansible/group_vars/alpha-keymaker-http.yml   | 15 ++++++
 ansible/group_vars/alpha-keymaker-worker.yml | 10 ++++
 ansible/keymaker-http.yml                    |  9 ++++
 ansible/keymaker-worker.yml                  |  8 +++
 ansible/keymaker.yml                         |  2 +
 9 files changed, 114 insertions(+)
 create mode 100644 ansible/group_vars/alpha-keymaker-base.yml
 create mode 100644 ansible/group_vars/alpha-keymaker-http.yml
 create mode 100644 ansible/group_vars/alpha-keymaker-worker.yml
 create mode 100644 ansible/keymaker-http.yml
 create mode 100644 ansible/keymaker-worker.yml
 create mode 100644 ansible/keymaker.yml

diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
index cbcfbd51..1c7cdf4a 100644
--- a/ansible/delta-hosts/variables
+++ b/ansible/delta-hosts/variables
@@ -84,6 +84,12 @@ eru_mongodb_replset=delta-rs0
 eru_mongodb_username=eru
 eru_subdomain=eru
 
+[keymaker:vars]
+keymaker_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:{{ pg_port }}
+keymaker_pg_pass=PASSWORD
+keymaker_pg_user=keymaker
+keymaker_new_relic_app_name=delta-big-poppa
+
 [khronos:vars]
 khronos_intercom_api_key=14771f14efb617900724a16345e57beb55ba9beb
 khronos_intercom_app_id=wqzm3rju
diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
index c709f8a7..598711cc 100644
--- a/ansible/gamma-hosts/variables
+++ b/ansible/gamma-hosts/variables
@@ -83,6 +83,11 @@ eru_subdomain=eru
 [kartographer:vars]
 kartographer_hello_runnable_github_token=000cb6b65858ad0a7590bc2370b5118ff1bc95db
 
+[keymaker:vars]
+keymaker_pg_host=gamma-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:32659
+keymaker_pg_pass=PASSWORD
+keymaker_pg_user=keymaker
+
 [khronos:vars]
 khronos_intercom_api_key=9b4ee7b4f9818b36e368985fda0befa611928876
 khronos_intercom_app_id=xs5g95pd
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 07086e6f..8b43fa61 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -145,6 +145,13 @@ github_varnish_port: 80
 # kartographer
 kartographer_rollbar_token: a7f85fda20bd4b9fb7b1197fc04d3c89
 
+# keymaker
+keymaker_pg_database: keymaker
+keymaker_port: 7788
+keymaker_host_address: keymaker
+keymaker_http_rollbar_token: 4cfd134be18b4f1ca8e05925088360ff
+keymaker_worker_rollbar_token: b6685a5db05d4550afe1c8545c095b29
+
 # khronos
 rollbar_khronos_token: 5a140828cce14410812d34a3ef936f25
 
diff --git a/ansible/group_vars/alpha-keymaker-base.yml b/ansible/group_vars/alpha-keymaker-base.yml
new file mode 100644
index 00000000..481ae88f
--- /dev/null
+++ b/ansible/group_vars/alpha-keymaker-base.yml
@@ -0,0 +1,52 @@
+node_version: 4.4.7
+npm_version: 2
+
+inject_ca: false
+repo: "git@github.com:CodeNow/keymaker.git"
+
+dockerfile_pre_install_commands: [
+  "apt-get update",
+  "apt-get install postgresql-client=9.4+165+deb8u2 -y"
+]
+
+keymaker_base_container_envs:
+  - name: DATADOG_HOST
+    valueFrom: "spec.nodeName"
+  - name: DATADOG_PORT
+    value: "{{ datadog_port }}"
+  - name: NODE_ENV
+    value: "{{ node_env }}"
+  - name: PGUSER
+    value: "{{ keymaker_pg_user }}"
+  - name: PGPASSWORD
+    value: "{{ keymaker_pg_pass }}"
+  - name: PGHOST
+    value: "{{ pg_host }}"
+  - name: PGPORT
+    value: "{{ pg_port }}"
+  - name: PGDATABASE
+    value: "{{ keymaker_pg_database }}"
+  - name: POSTGRES_CONNECT_STRING
+    value: "postgres://{{ keymaker_pg_user }}:{{ keymaker_pg_pass }}@{{ keymaker_pg_host }}/{{ keymaker_pg_database }}"
+  - name: RABBITMQ_HOSTNAME
+    value: "{{ rabbit_host_address }}"
+  - name: RABBITMQ_PASSWORD
+    value: "{{ rabbit_password }}"
+  - name: RABBITMQ_PORT
+    value: "{{ rabbit_port }}"
+  - name: RABBITMQ_USERNAME
+    value: "{{ rabbit_username }}"
+  - name: GITHUB_VARNISH_HOST
+    value: "{{ github_varnish_host }}"
+  - name: GITHUB_VARNISH_PORT
+    value: "{{ github_varnish_port }}"
+  - name: GITHUB_PROTOCOL
+    value: "http"
+  - name: NEW_RELIC_APP_NAME
+    value: "{{ keymaker_new_relic_app_name | default('ansible_undefined') }}"
+  - name: NEW_RELIC_LICENSE_KEY
+    value: "{{ new_relic_license_key | default('ansible_undefined') }}"
+  - name: NEW_RELIC_LOG_LEVEL
+    value: "fatal"
+  - name: NEW_RELIC_NO_CONFIG_FILE
+    value: "true"
diff --git a/ansible/group_vars/alpha-keymaker-http.yml b/ansible/group_vars/alpha-keymaker-http.yml
new file mode 100644
index 00000000..6f566a32
--- /dev/null
+++ b/ansible/group_vars/alpha-keymaker-http.yml
@@ -0,0 +1,15 @@
+name: keymaker-http
+service_name: keymaker
+
+hosted_ports: ["{{ keymaker_port }}"]
+num_replicas: 4
+
+envs:
+  - name: PORT
+    value: "{{ keymaker_port }}"
+  - name: ROLLBAR_KEY
+    value: "{{ keymaker_http_rollbar_token }}"
+
+container_envs: "{{ keymaker_base_container_envs + envs }}"
+
+container_run_args: npm run start-http
diff --git a/ansible/group_vars/alpha-keymaker-worker.yml b/ansible/group_vars/alpha-keymaker-worker.yml
new file mode 100644
index 00000000..df5130b3
--- /dev/null
+++ b/ansible/group_vars/alpha-keymaker-worker.yml
@@ -0,0 +1,10 @@
+name: keymaker-worker
+
+envs:
+  - name: ROLLBAR_KEY
+    value: "{{ big_poppa_worker_rollbar_token }}"
+
+container_envs: "{{ keymaker_base_container_envs + envs }}"
+
+container_run_args: npm run start-worker
+
diff --git a/ansible/keymaker-http.yml b/ansible/keymaker-http.yml
new file mode 100644
index 00000000..baa18b45
--- /dev/null
+++ b/ansible/keymaker-http.yml
@@ -0,0 +1,9 @@
+---
+- hosts: keymaker
+  vars_files:
+    - group_vars/alpha-keymaker-base.yml
+    - group_vars/alpha-keymaker-http.yml
+  roles:
+  - role: builder
+  - role: k8-deployment
+  - role: k8-service
diff --git a/ansible/keymaker-worker.yml b/ansible/keymaker-worker.yml
new file mode 100644
index 00000000..2fe0189f
--- /dev/null
+++ b/ansible/keymaker-worker.yml
@@ -0,0 +1,8 @@
+---
+- hosts: keymaker
+  vars_files:
+    - group_vars/alpha-keymaker-base.yml
+    - group_vars/alpha-keymaker-worker.yml
+  roles:
+  - role: builder
+  - role: k8-deployment
diff --git a/ansible/keymaker.yml b/ansible/keymaker.yml
new file mode 100644
index 00000000..942890b7
--- /dev/null
+++ b/ansible/keymaker.yml
@@ -0,0 +1,2 @@
+- include: keymaker-http.yml
+- include: keymaker-worker.yml

From b9b09b8da7dce81abf9b534bd465327781c0887a Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 15:15:04 -0700
Subject: [PATCH 02/11] Removed installing of postgres client

---
 ansible/group_vars/alpha-keymaker-base.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ansible/group_vars/alpha-keymaker-base.yml b/ansible/group_vars/alpha-keymaker-base.yml
index 481ae88f..ad2ba218 100644
--- a/ansible/group_vars/alpha-keymaker-base.yml
+++ b/ansible/group_vars/alpha-keymaker-base.yml
@@ -4,11 +4,6 @@ npm_version: 2
 inject_ca: false
 repo: "git@github.com:CodeNow/keymaker.git"
 
-dockerfile_pre_install_commands: [
-  "apt-get update",
-  "apt-get install postgresql-client=9.4+165+deb8u2 -y"
-]
-
 keymaker_base_container_envs:
   - name: DATADOG_HOST
     valueFrom: "spec.nodeName"

From 240c225145e8847b089baff8fa22cc55262b6b09 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 15:42:05 -0700
Subject: [PATCH 03/11] Added keymaker pg password for gamma

---
 ansible/gamma-hosts/variables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/gamma-hosts/variables b/ansible/gamma-hosts/variables
index 598711cc..46baf1d1 100644
--- a/ansible/gamma-hosts/variables
+++ b/ansible/gamma-hosts/variables
@@ -85,7 +85,7 @@ kartographer_hello_runnable_github_token=000cb6b65858ad0a7590bc2370b5118ff1bc95d
 
 [keymaker:vars]
 keymaker_pg_host=gamma-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:32659
-keymaker_pg_pass=PASSWORD
+keymaker_pg_pass=n4CsuCiWgbx.2BVJ
 keymaker_pg_user=keymaker
 
 [khronos:vars]

From c01cc0fdb803570a5e6676326eb52f38c2314b38 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 16:08:03 -0700
Subject: [PATCH 04/11] Created password for keymaker on delta

---
 ansible/delta-hosts/variables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
index 1c7cdf4a..aecff5f9 100644
--- a/ansible/delta-hosts/variables
+++ b/ansible/delta-hosts/variables
@@ -86,7 +86,7 @@ eru_subdomain=eru
 
 [keymaker:vars]
 keymaker_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:{{ pg_port }}
-keymaker_pg_pass=PASSWORD
+keymaker_pg_pass=8MsajH7RQuJ+fTCh
 keymaker_pg_user=keymaker
 keymaker_new_relic_app_name=delta-big-poppa
 

From dbd504cc0dbb993905ebd81d68a6803f6ec04df0 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 16:18:24 -0700
Subject: [PATCH 05/11] Fixed var name

---
 ansible/delta-hosts/variables | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables
index aecff5f9..31a4f664 100644
--- a/ansible/delta-hosts/variables
+++ b/ansible/delta-hosts/variables
@@ -88,7 +88,7 @@ eru_subdomain=eru
 keymaker_pg_host=delta-big-poppa.cnksgdqarobf.us-west-2.rds.amazonaws.com:{{ pg_port }}
 keymaker_pg_pass=8MsajH7RQuJ+fTCh
 keymaker_pg_user=keymaker
-keymaker_new_relic_app_name=delta-big-poppa
+keymaker_new_relic_app_name=delta-keymaker
 
 [khronos:vars]
 khronos_intercom_api_key=14771f14efb617900724a16345e57beb55ba9beb

From ce392311faf7310b1b97db9dbf2aa41ebba11128 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 16:21:14 -0700
Subject: [PATCH 06/11] Added keymaker to localhost

---
 ansible/delta-hosts/hosts | 3 +++
 ansible/gamma-hosts/hosts | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/ansible/delta-hosts/hosts b/ansible/delta-hosts/hosts
index c5b14919..6be6fd74 100644
--- a/ansible/delta-hosts/hosts
+++ b/ansible/delta-hosts/hosts
@@ -74,6 +74,9 @@ localhost
 [link]
 localhost
 
+[keymaker]
+localhost
+
 [khronos]
 localhost
 
diff --git a/ansible/gamma-hosts/hosts b/ansible/gamma-hosts/hosts
index a7fd1d5a..ce2f2eb4 100644
--- a/ansible/gamma-hosts/hosts
+++ b/ansible/gamma-hosts/hosts
@@ -68,6 +68,9 @@ localhost
 [charon]
 localhost
 
+[keymaker]
+localhost
+
 [khronos]
 localhost
 

From 68b98ba0833adfe3d703d0eca899653cfb97779c Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Tue, 16 May 2017 16:53:39 -0700
Subject: [PATCH 07/11] Fixed node version

---
 ansible/group_vars/alpha-keymaker-base.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/ansible/group_vars/alpha-keymaker-base.yml b/ansible/group_vars/alpha-keymaker-base.yml
index ad2ba218..df5b55eb 100644
--- a/ansible/group_vars/alpha-keymaker-base.yml
+++ b/ansible/group_vars/alpha-keymaker-base.yml
@@ -1,5 +1,4 @@
-node_version: 4.4.7
-npm_version: 2
+node_version: 6.10.2
 
 inject_ca: false
 repo: "git@github.com:CodeNow/keymaker.git"

From 4c54ae79e91e45e314d67cb92cb70944e2713e3a Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Wed, 17 May 2017 11:15:47 -0700
Subject: [PATCH 08/11] Removed unused postgres strings.

---
 ansible/group_vars/alpha-keymaker-base.yml | 10 ----------
 ansible/keymaker-worker.yml                |  1 -
 2 files changed, 11 deletions(-)

diff --git a/ansible/group_vars/alpha-keymaker-base.yml b/ansible/group_vars/alpha-keymaker-base.yml
index df5b55eb..c1f1eb97 100644
--- a/ansible/group_vars/alpha-keymaker-base.yml
+++ b/ansible/group_vars/alpha-keymaker-base.yml
@@ -10,16 +10,6 @@ keymaker_base_container_envs:
     value: "{{ datadog_port }}"
   - name: NODE_ENV
     value: "{{ node_env }}"
-  - name: PGUSER
-    value: "{{ keymaker_pg_user }}"
-  - name: PGPASSWORD
-    value: "{{ keymaker_pg_pass }}"
-  - name: PGHOST
-    value: "{{ pg_host }}"
-  - name: PGPORT
-    value: "{{ pg_port }}"
-  - name: PGDATABASE
-    value: "{{ keymaker_pg_database }}"
   - name: POSTGRES_CONNECT_STRING
     value: "postgres://{{ keymaker_pg_user }}:{{ keymaker_pg_pass }}@{{ keymaker_pg_host }}/{{ keymaker_pg_database }}"
   - name: RABBITMQ_HOSTNAME
diff --git a/ansible/keymaker-worker.yml b/ansible/keymaker-worker.yml
index 2fe0189f..540588fc 100644
--- a/ansible/keymaker-worker.yml
+++ b/ansible/keymaker-worker.yml
@@ -4,5 +4,4 @@
     - group_vars/alpha-keymaker-base.yml
     - group_vars/alpha-keymaker-worker.yml
   roles:
-  - role: builder
   - role: k8-deployment

From 039948164d19f2388c2e1e422ed06313fa47331d Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Wed, 17 May 2017 14:12:02 -0700
Subject: [PATCH 09/11] Changed port.

---
 ansible/group_vars/all.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml
index 8b43fa61..949bebfb 100644
--- a/ansible/group_vars/all.yml
+++ b/ansible/group_vars/all.yml
@@ -147,7 +147,7 @@ kartographer_rollbar_token: a7f85fda20bd4b9fb7b1197fc04d3c89
 
 # keymaker
 keymaker_pg_database: keymaker
-keymaker_port: 7788
+keymaker_port: 3008
 keymaker_host_address: keymaker
 keymaker_http_rollbar_token: 4cfd134be18b4f1ca8e05925088360ff
 keymaker_worker_rollbar_token: b6685a5db05d4550afe1c8545c095b29

From a2d0363459fd74821adeb20ffeb33b0b086885a5 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Wed, 17 May 2017 15:36:20 -0700
Subject: [PATCH 10/11] Added builder role back in so it publishes to quay.

---
 ansible/keymaker-worker.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ansible/keymaker-worker.yml b/ansible/keymaker-worker.yml
index 540588fc..2fe0189f 100644
--- a/ansible/keymaker-worker.yml
+++ b/ansible/keymaker-worker.yml
@@ -4,4 +4,5 @@
     - group_vars/alpha-keymaker-base.yml
     - group_vars/alpha-keymaker-worker.yml
   roles:
+  - role: builder
   - role: k8-deployment

From 6eb6cc470eaf5a04d9b5164afd19e8555acecdf0 Mon Sep 17 00:00:00 2001
From: Myztiq <kahn@runnable.com>
Date: Wed, 17 May 2017 16:42:12 -0700
Subject: [PATCH 11/11] We don't need 4 replicas

---
 ansible/group_vars/alpha-keymaker-http.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ansible/group_vars/alpha-keymaker-http.yml b/ansible/group_vars/alpha-keymaker-http.yml
index 6f566a32..f27e322c 100644
--- a/ansible/group_vars/alpha-keymaker-http.yml
+++ b/ansible/group_vars/alpha-keymaker-http.yml
@@ -2,7 +2,6 @@ name: keymaker-http
 service_name: keymaker
 
 hosted_ports: ["{{ keymaker_port }}"]
-num_replicas: 4
 
 envs:
   - name: PORT