Skip to content

Commit 0240417

Browse files
author
Henry Mollman
committed
Uncomment
1 parent bed07a6 commit 0240417

4 files changed

Lines changed: 7 additions & 0 deletions

File tree

ansible/gamma-hosts/hosts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,9 @@ localhost
135135
[kartographer]
136136
localhost
137137

138+
[user-local]
139+
localhost
140+
138141
[navi-port-router]
139142
gamma-userland
140143

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
mode="0400"
2323
with_items:
2424
- { file_name: 'auth-token', value: "{{ vault_auth_token }}" }
25+
- { file_name: 'user-vault-auth-token', value: "{{ dock_vault_user_creation_access_token }}" }
2526
- { file_name: 'token-01', value: "{{ vault_token_01 }}" }
2627
- { file_name: 'token-02', value: "{{ vault_token_02 }}" }
2728
- { file_name: 'token-03', value: "{{ vault_token_03 }}" }

ansible/roles/dock_launch_config/tasks/main.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@
4343
set_fact:
4444
vault_tokens:
4545
- { file_name: 'auth-token', value: "{{ vault_auth_token }}" }
46+
- { file_name: 'user-vault-auth-token', value: "{{ dock_vault_user_creation_access_token }}" }
4647
- { file_name: 'token-01', value: "{{ vault_token_01 }}" }
4748
- { file_name: 'token-02', value: "{{ vault_token_02 }}" }
4849
- { file_name: 'token-03', value: "{{ vault_token_03 }}" }

ansible/roles/dock_launch_config/templates/init.tmpl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ service charon start
3939
CONSUL_HOSTNAME={{ consul_host_address }} \
4040
CONSUL_PORT={{ consul_api_port }} \
4141
VAULT_PORT={{ vault_port }} \
42+
USER_VAULT_HOSTNAME={{ user_vault_host_address }} \
43+
USER_VAULT_PORT={{ user_vault_port }} \
4244
{% if has_token %}
4345
S3_ACCESS_KEY={{ dock_registry_s3_access_key }} \
4446
S3_SECRET_KEY={{ dock_registry_s3_secret_key }} \

0 commit comments

Comments
 (0)