PR comments

Author: Henry Mollman

ansible/roles/dock_launch_config/tasks/main.yml

@@ -11,7 +11,8 @@
     - app_name: "krain"
     - enviroment_vars: enviroment_vars
 
-# this requires the use of gnu/coreutils base64
+# this requires the use of gnu/coreutils base64 (`brew install coreutils`)
+# Allows us to use same base64 locally and in host
 - name: encode krain config to base64
   shell: cat ~/{{ app_name }}.conf | base64 -w 0
   register: krain_base64
@@ -30,7 +31,8 @@
     - app_name: "charon"
     - enviroment_vars: enviroment_vars
 
-# this requires the use of gnu/coreutils base64
+# this requires the use of gnu/coreutils base64 (`brew install coreutils`)
+# Allows us to use same base64 locally and in host
 - name: encode charon config to base64
   shell: cat ~/{{ app_name }}.conf | base64 -w 0
   register: charon_base64

ansible/roles/dock_launch_config/templates/init.tmpl

@@ -18,6 +18,9 @@ chmod 0711 /opt/runnable/dock-init/consul-resources/vault/{{ node_env }}
 {% for item in tokens %}
 echo {{ item.value }} > /opt/runnable/dock-init/consul-resources/vault/{{ node_env }}/{{ item.file_name }}
 {% endfor %}
+{% set hasToken = false %}
+{% else %}
+{% set hasToken = true %}
 {% endif %}
 
 # Add upstart files for charon and krain
@@ -39,5 +42,9 @@ start amazon-ssm-agent
 service krain start
 service charon start
 {% if not is_dock_pool %}
+{% if hasToken %}
+CONSUL_HOSTNAME={{ consul_host_address }} CONSUL_PORT={{ consul_api_port }} VAULT_PORT={{ vault_port }} S3_ACCESS_KEY={{ S3_ACCESS_KEY }} S3_SECRET_KEY={{ S3_SECRET_KEY }} AWS_ACCESS_KEY={{ AWS_ACCESS_KEY }} AWS_SECRET_KEY={{ AWS_SECRET_KEY }} bash /opt/runnable/dock-init/init.sh | tee /var/log/user-script-dock-init.log
+{% else %}
 CONSUL_HOSTNAME={{ consul_host_address }} CONSUL_PORT={{ consul_api_port }} VAULT_PORT={{ vault_port }} bash /opt/runnable/dock-init/init.sh | tee /var/log/user-script-dock-init.log
 {% endif %}
+{% endif %}