Fixing navi/link stuff

Author: thejsj

ansible/group_vars/all.yml

@@ -239,6 +239,8 @@ swarm_container_name: swarm
 # navi/link
 link_hello_runnable_token: 5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29
 navi_mongo_database: navi
+navi_mongo_auth: "{{ api_mongo_auth }}"
+navi_mongo_hosts: "{{ mongo_hosts }}"
 
 npm_token: c0c4b32a-3de5-4e27-9d32-56c1616746d8
 

ansible/group_vars/alpha-mongo-create-users.yml

@@ -9,5 +9,5 @@ container_run_args: >
   mongo mongo/admin --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'root',db:'admin'}]});\" &&
   mongo mongo/api --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'readWrite',db:'api'}]});\" &&
   mongo mongo/clio --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'readWrite',db:'clio'}]});\" &&
-  mongo mongo/navi --eval \"db.createUser({user:'{{ mongo_user }}',pwd:'{{ mongo_password }}',roles:[{role:'readWrite',db:'navi'}]});\" &&
+  mongo mongo/navi --eval \"db.createUser({user:'{{ navi_mongo_user | default(mongo_user) }}',pwd:'{{ navi_mongo_password | default(mogno_password) }}',roles:[{role:'readWrite',db:'navi'}]});\" &&
   echo Finished

ansible/group_vars/alpha-navi.yml

@@ -27,7 +27,7 @@ container_envs:
   - name: LOG_LEVEL_STDOUT
     value: "trace"
   - name: MONGO
-    value: "mongodb://{{ navi_mongo_auth }}@{{ mongo_hosts }}/{{ navi_mongo_database }}"
+    value: "mongodb://{{ navi_mongo_auth }}@{{ navi_mongo_hosts }}/{{ navi_mongo_database }}"
   - name: NODE_ENV
     value: "{{ node_env }}"
   - name: RABBITMQ_HOSTNAME

environments/delta/main.yml

@@ -13,7 +13,9 @@ api_github_deploy_keys_bucket: runnable.deploykeys.production
 api_intercom_api_key: 46e75ada5d21f248787689b35fe80e11efe9303a
 api_intercom_app_id: wqzm3rju
 api_mixpanel_app_id: 57260a5b6fc972e9c69184882efd009e
-api_mongo_auth: api:72192e5a-a5e1-11e5-add9-0270db32f7ad
+api_mongo_user: api
+api_mongo_password: 72192e5a-a5e1-11e5-add9-0270db32f7ad
+api_mongo_auth: "{{ api_mongo_user }}:{{ api_mongo_password }}"
 api_mongo_database: delta
 api_mongo_replset_name: delta-rs0
 api_new_relic_app_name: delta-api-production
@@ -175,7 +177,7 @@ github_protocol: https
 is_github_enterprise: false
 mongo_hosts: 10.8.4.216:27017,10.8.10.254:27017,10.8.13.89:27017
 mongo_port: 27017
-navi_mongo: 10.8.6.41
+navi_mongo_hosts: "10.8.6.41"
 new_relic_license_key: 338516e0826451c297d44dc60aeaf0a0ca4bfead
 node_env: production-delta
 pg_host: delta-infradb.cnksgdqarobf.us-west-2.rds.amazonaws.com

environments/gamma/main.yml

@@ -11,7 +11,9 @@ api_github_client_id: b6072dc57062faca7fcb
 api_github_client_secret: ba73a9294dc4bfaa7ed02ba187f73918506e4293
 api_github_deploy_keys_bucket: runnable.deploykeys.production-beta
 api_mixpanel_app_id: c41affa4b08818443365c526cbb51606
-api_mongo_auth: api:3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
+mongo_user: api
+mongo_password: 3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
+api_mongo_auth: "{{ mongo_user }}:{{ mongo_password }}"
 api_mongo_database: gamma
 api_mongo_replset_name: gamma-rs0
 api_rollbar_key: a90d9c262c7c48cfabbd32fd0a1bc61c
@@ -96,6 +98,10 @@ khronos_mongo_replset_name: gamma
 
 mongo_volume_id: vol-0daf05c3686a7e0a8
 
+navi_mongo_user: navi
+navi_mongo_password: 3f5210b8-8fe3-11e5-8e62-07b6eff19ecb
+navi_mongo_auth: "{{ navi_mongo_user }}:{{ navi_mongo_password }}"
+
 navi_cookie_secret: c90e5fb4e7e511e597309a79f06e9478
 
 optimus_aws_access_id: AKIAJPA2ZYSVVA5V7XXQ

environments/runnable-self-hosted-2/main.yml

@@ -110,6 +110,7 @@ is_github_enterprise: false
 mongo_port: 27017
 navi_mongo_auth: "{{ mongo_user }}:{{ mongo_password }}"
 navi_mongo_database: "navi"
+navi_mongo_hosts: "mongo"
 node_env: "{{ environment }}"
 pg_host: "{{ postgres_host }}"
 pg_pass: "{{ postgres_password }}"