Merge pull request #647 from CodeNow/5-2-update-dock-init-and-charon

Update dock-init and charon

Author: henrymollman

ansible/dock.yml

@@ -9,7 +9,7 @@
       name={{ dock }}
       groups=dock
 
-- include: image-builder.yml git_branch="v4.4.0"
+- include: image-builder.yml git_branch="v4.5.0"
 
 - hosts: "{{ dock }}"
   tasks:
@@ -25,6 +25,6 @@
   - { role: install-ssm }
   - { role: dock-images }
 
-- include: charon.yml git_branch="v5.0.1"
-- include: dock-init.yml git_branch="v10.1.2"
+- include: charon.yml git_branch="v5.0.3"
+- include: dock-init.yml git_branch="v10.1.4"
 - include: krain.yml git_branch="v0.3.1"

ansible/gamma-hosts/hosts

@@ -138,6 +138,9 @@ localhost
 [kartographer]
 localhost
 
+[user-local]
+localhost
+
 [navi-port-router]
 gamma-userland
 

ansible/group_vars/alpha-api-base.yml

@@ -119,4 +119,4 @@ api_base_container_envs:
   - name: INTERCOM_API_KEY
     value: "{{ api_intercom_api_key | default('ansible_undefined') }}"
   - name: USER_VAULT_ENDPOINT
-    value: "http://{{ user_vault_host_address }}:{{ user_vault_port }}"
+    value: "http://{{ user_vault_load_balancer }}:{{ user_vault_port }}"

ansible/roles/dock-init/tasks/main.yml

@@ -22,6 +22,7 @@
     mode="0400"
   with_items:
   - { file_name: 'auth-token', value: "{{ vault_auth_token }}" }
+  - { file_name: 'user-vault-auth-token', value: "{{ dock_vault_user_creation_access_token }}" }
   - { file_name: 'token-01', value: "{{ vault_token_01 }}" }
   - { file_name: 'token-02', value: "{{ vault_token_02 }}" }
   - { file_name: 'token-03', value: "{{ vault_token_03 }}" }

ansible/roles/dock_launch_config/tasks/main.yml

@@ -43,6 +43,7 @@
   set_fact:
     vault_tokens:
     - { file_name: 'auth-token', value: "{{ vault_auth_token }}" }
+    - { file_name: 'user-vault-auth-token', value: "{{ dock_vault_user_creation_access_token }}" }
     - { file_name: 'token-01', value: "{{ vault_token_01 }}" }
     - { file_name: 'token-02', value: "{{ vault_token_02 }}" }
     - { file_name: 'token-03', value: "{{ vault_token_03 }}" }

ansible/roles/dock_launch_config/templates/init.tmpl

@@ -39,6 +39,8 @@ service charon start
 CONSUL_HOSTNAME={{ consul_host_address }} \
 CONSUL_PORT={{ consul_api_port }} \
 VAULT_PORT={{ vault_port }} \
+USER_VAULT_HOSTNAME={{ user_vault_load_balancer }} \
+USER_VAULT_PORT={{ user_vault_port }} \
 {% if has_token %}
 S3_ACCESS_KEY={{ dock_registry_s3_access_key }} \
 S3_SECRET_KEY={{ dock_registry_s3_secret_key }} \