[CORD-1530]
Make config file directory creation using become an optional step
Cleanup various incongruities in defaults
Change-Id: I6fb77ab1ccdf08a18468adbc59474f94d603fc11
diff --git a/roles/cord-profile/defaults/main.yml b/roles/cord-profile/defaults/main.yml
index 6a30e58..2b9b9f2 100644
--- a/roles/cord-profile/defaults/main.yml
+++ b/roles/cord-profile/defaults/main.yml
@@ -4,10 +4,14 @@
# where the cord_profile directory is on the config node
config_cord_profile_dir: "/opt/cord_profile"
+head_cord_dir: "/opt/cord"
+
pki_dir: "{{ playbook_dir }}/pki"
ssh_pki_dir: "{{ playbook_dir }}/ssh_pki"
credentials_dir: "{{ playbook_dir }}/credentials"
+head_credentials_dir: "/opt/credentials"
+
# where cord files are copied to on head node
head_cord_profile_dir: "/opt/cord_profile"
head_cord_dir: "/opt/cord"
diff --git a/roles/cord-profile/tasks/main.yml b/roles/cord-profile/tasks/main.yml
index 5831a16..f6ed2bc 100644
--- a/roles/cord-profile/tasks/main.yml
+++ b/roles/cord-profile/tasks/main.yml
@@ -2,8 +2,9 @@
# cord-profile/tasks/main.yml
# Constructs a CORD service profile directory and configuration files
+# if this step fails, may need to include `create-configdirs-become` role to
+# create directory using become.
- name: Create cord_profile directory
- become: yes
file:
path: "{{ config_cord_profile_dir }}"
state: directory
diff --git a/roles/cord-profile/templates/docker-compose.yml.j2 b/roles/cord-profile/templates/docker-compose.yml.j2
index fe16161..c10e2d3 100644
--- a/roles/cord-profile/templates/docker-compose.yml.j2
+++ b/roles/cord-profile/templates/docker-compose.yml.j2
@@ -297,7 +297,7 @@
{% endif %}
volumes:
- {{ head_cord_profile_dir }}/node_key:/opt/cord_profile/node_key:ro
- - /opt/credentials:/opt/xos/services/{{ svc.name }}/credentials:ro
+ - {{ head_credentials_dir }}:/opt/xos/services/{{ svc.name }}/credentials:ro
- {{ head_cord_profile_dir }}/im_cert_chain.pem:/usr/local/share/ca-certificates/local_certs.crt:ro
{% if svc.keypair is defined %}
- {{ head_cord_profile_dir }}/key_import/{{ svc.keypair }}:/opt/xos/services/{{ svc.name }}/keys/{{ svc.keypair }}:ro