From d9aadbbaa2d2c603b898052ceeae3e6c2c5ef0ad Mon Sep 17 00:00:00 2001 From: Myztiq Date: Tue, 26 Apr 2016 13:16:22 -0700 Subject: [PATCH 1/2] Added intercom env vars for navi. --- ansible/delta-hosts/variables | 2 ++ ansible/group_vars/alpha-navi.yml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/ansible/delta-hosts/variables b/ansible/delta-hosts/variables index a76bd531..f457932c 100644 --- a/ansible/delta-hosts/variables +++ b/ansible/delta-hosts/variables @@ -56,6 +56,8 @@ metis_rollbar_key=fdc8565a7ce64c6d9432c34be425937c [navi:vars] navi_new_relic_app_name=delta-navi navi_cookie_secret=e80173940e7bdd84734e868b6ea054a0 +navi_intercom_api_key=6f6400402170e78fa1ad4418608aacc63512122b +navi_intercom_app_id=wqzm3rju [optimus:vars] diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml index 257db050..dac3af7b 100644 --- a/ansible/group_vars/alpha-navi.yml +++ b/ansible/group_vars/alpha-navi.yml @@ -32,6 +32,8 @@ container_envs: > -e REDIS_CACERT={{ redis_ca_cert_path }} -e REDIS_IPADDRESS={{ redis_host_address }} -e REDIS_PORT={{ redis_tls_port }} + -e INTERCOM_APP_ID = {{ navi_intercom_app_id | default('undefined') }} + -e INTERCOM_API_KEY = {{ navi_intercom_api_key | default('undefined') }} container_run_opts: > -h {{ name }} From 14373fd3e2ddb103b38d1acb0dedcba2f80006db Mon Sep 17 00:00:00 2001 From: Myztiq Date: Thu, 28 Apr 2016 13:07:42 -0700 Subject: [PATCH 2/2] Converted to only add the env vars if we've got the key to add. --- ansible/group_vars/alpha-navi.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ansible/group_vars/alpha-navi.yml b/ansible/group_vars/alpha-navi.yml index dac3af7b..f4b10980 100644 --- a/ansible/group_vars/alpha-navi.yml +++ b/ansible/group_vars/alpha-navi.yml @@ -32,8 +32,8 @@ container_envs: > -e REDIS_CACERT={{ redis_ca_cert_path }} -e REDIS_IPADDRESS={{ redis_host_address }} -e REDIS_PORT={{ redis_tls_port }} - -e INTERCOM_APP_ID = {{ navi_intercom_app_id | default('undefined') }} - -e INTERCOM_API_KEY = {{ navi_intercom_api_key | default('undefined') }} + {% if navi_intercom_app_id is defined %} -e INTERCOM_APP_ID={{ navi_intercom_app_id }} {% endif %} + {% if navi_intercom_api_key is defined %} -e INTERCOM_API_KEY={{ navi_intercom_api_key }} {% endif %} container_run_opts: > -h {{ name }}