cleanup link vars

Author: Bryan Kendall

ansible/group_vars/alpha-link.yml

@@ -1,24 +1,24 @@
-name: "link"
+name: link
 
-container_image: "registry.runnable.com/runnable/{{ name }}"
+container_image: registry.runnable.com/runnable/{{ name }}
 container_tag: "{{ git_branch }}"
-repo: "git@github.com:CodeNow/{{ name }}.git"
+repo: git@github.com:CodeNow/{{ name }}.git
 node_version: "4.2.1"
 npm_version: "2.14.7"
 
-mongo_host: "{{ hostvars[groups['mongo-navi'][0]]['ansible_default_ipv4']['address'] }}"
-
 container_envs: >
-  -e API_HOST=http://api.{{ domain }}
-  -e DATADOG_HOST={{ datadog_host }}
+  -e API_HOST=http://{{ api_hostname }}
+  -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN=5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29
-  -e MONGO=mongodb://{{ mongo_host }}:27017/{{ navi_mongo_database }}
+  -e MONGO=mongodb://{{ navi_mongo_host_address }}:{{ navi_mongo_port }}/{{ navi_mongo_database }}
   -e NODE_ENV={{ node_env }}
-  -e RABBITMQ_HOSTNAME={{ rabbit_host | default(hostvars[groups['rabbitmq'][0]]['ansible_default_ipv4']['address']) }}
+  -e RABBITMQ_HOSTNAME={{ rabbit_host_address }}
   -e RABBITMQ_PASSWORD={{ rabbit_password }}
   -e RABBITMQ_PORT={{ rabbit_port }}
   -e RABBITMQ_USERNAME={{ rabbit_username }}
   -e USER_CONTENT_DOMAIN={{ user_content_domain }}
 
-container_run_opts: "-h link -d {{container_envs}}"
+container_run_opts: >
+  -h {{ name }}
+  -d {{ container_envs }}