Add new directories

Author: thejsj

ansible/group_vars/all.yml

@@ -2,7 +2,11 @@
 # ops
 ops_slack_channel_url: https://hooks.slack.com/services/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
 pager_duty_key: testkey
-opts_root: "../environments/{{ env }}/k8/{{ name }}"
+environment_root: "../environments/{{ env }}/"
+opts_root: "{{ environment_root }}/k8/{{ name }}"
+secrets_root: "{{ environment_root }}/secrets/"
+certs_root: "{{ secrets_root }}/certs/"
+domains_root: "{{ secrets_root }}/domains/"
 config_maps_path: "{{ opts_root }}/configMaps"
 services_path: "{{ opts_root }}/services"
 deployments_path: "{{ opts_root }}/deployments"

ansible/roles/dock_launch_config/tasks/main.yml

@@ -43,21 +43,20 @@
   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 }}" }
 
 - name: encode ca.pem to base64
-  shell: cat ./certs/ca.pem | gbase64 -w 0
+  shell: cat ./secrets/certs/ca.pem | gbase64 -w 0
   register: ca_pem_base64
 
 - name: encode ca-key.pem to base64
-  shell: cat ./certs/ca-key.pem | gbase64 -w 0
+  shell: cat ./secrets/certs/ca-key.pem | gbase64 -w 0
   register: ca_key_pem_base64
 
 - name: encode pass to base64
-  shell: cat ./certs/pass | gbase64 -w 0
+  shell: cat ./secrets/certs/pass | gbase64 -w 0
   register: pass_base64
 
 - name: Generate dock script