Merge pull request #263 from CodeNow/SAN-3314-use-api-url

SAN-3314 Use API_URL

Author: Myztiq

ansible/group_vars/all.yml

@@ -35,6 +35,7 @@ loggly_username: ops
 # api
 api_github_hook_secret: 3V3RYTHINGisAW3S0ME!
 api_hostname: api.{{ domain }}
+api_url: {{ api_url }}
 api_neo4j_port: 7474
 api_neo4j_protocol: http://
 api_port: 80

ansible/group_vars/alpha-api.yml

@@ -25,11 +25,11 @@ container_envs: >
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
   -e FILIBUSTER_PORT={{ filibuster_port }}
-  -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
+  -e GITHUB_CALLBACK_URL={{ api_url }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
-  -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
+  -e GITHUB_HOOK_URL={{ api_url }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e KRAIN_PORT={{ krain_port }}
   -e MAVIS_HOST=http://{{ mavis_hostname }}:80

ansible/group_vars/alpha-charon.yml

@@ -4,7 +4,7 @@ app_repo: git@github.com:CodeNow/{{ name }}.git
 hosted_ports: ["{{ charon_port }}"]
 
 enviroment_vars:
-  API_HOST: "{{ api_hostname }}"
+  API_URL: "{{ api_url }}"
   API_TOKEN: 51c61b779f3de616a9639cfc44a22c79fbd8e328
   DATADOG_HOST: "{{ datadog_host_address }}"
   DATADOG_PORT: "{{ datadog_port }}"

ansible/group_vars/alpha-detention.yml

@@ -17,7 +17,7 @@ dockerfile_post_install_commands: [
 
 container_envs: >
   -e ABSOLUTE_URL={{ detention_hostname }}
-  -e API_HOSTNAME={{ api_hostname }}
+  -e API_URL={{ api_url }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e NODE_ENV={{ node_env }}
   -e PORT={{ hosted_ports[0] }}

ansible/group_vars/alpha-eru.yml

@@ -15,7 +15,7 @@ container_envs: >
   -e ADMIN_DOMAIN={{ eru_hostname }}
   -e ADMIN_GITHUB_ID={{ eru_github_id }}
   -e ADMIN_GITHUB_SECRET={{ eru_github_secret }}
-  -e API_HOST={{ api_hostname }}
+  -e API_URL={{ api_url }}
   -e RUNNABLE_HOST={{ domain }}
   -e PORT={{ hosted_ports[0] }}
 

ansible/group_vars/alpha-link.yml

@@ -7,7 +7,7 @@ node_version: "4.2.1"
 npm_version: "2.14.7"
 
 container_envs: >
-  -e API_HOST=http://{{ api_hostname }}
+  -e API_URL={{ api_url }}
   -e DATADOG_HOST={{ datadog_host_address }}
   -e DATADOG_PORT={{ datadog_port }}
   -e HELLO_RUNNABLE_GITHUB_TOKEN=5d8f7029d3d6941b0fc62a7eb8c605d8e0bc7c29

ansible/group_vars/alpha-web.yml

@@ -9,7 +9,7 @@ npm_version: "2.1.18"
 rollbar_token: "162a053bebd34e9eb6e2860543c7ae79"
 
 dockerfile_enviroment: [
-  "API_HOST //api.{{ domain }}",
+  "API_URL https//api.{{ domain }}",
   "USER_CONTENT_DOMAIN {{ user_content_domain }}",
   "NODE_ENV production"
 ]

ansible/group_vars/alpha-workers.yml

@@ -18,11 +18,11 @@ container_envs: >
   -e DATADOG_PORT={{ datadog_port }}
   -e DOMAIN={{ domain }}
   -e FILIBUSTER_PORT={{ filibuster_port }}
-  -e GITHUB_CALLBACK_URL=https://{{ api_hostname }}/auth/github/callback
+  -e GITHUB_CALLBACK_URL={{ api_url }}/auth/github/callback
   -e GITHUB_CLIENT_ID={{ api_github_client_id }}
   -e GITHUB_CLIENT_SECRET={{ api_github_client_secret }}
   -e GITHUB_DEPLOY_KEYS_BUCKET={{ api_github_deploy_keys_bucket }}
-  -e GITHUB_HOOK_URL=https://{{ api_hostname }}/actions/github
+  -e GITHUB_HOOK_URL={{ api_url }}/actions/github
   -e HELLO_RUNNABLE_GITHUB_TOKEN={{ api_hello_runnable_github_token }}
   -e IS_QUEUE_WORKER=true
   -e KRAIN_PORT={{ krain_port }}