commit 44845c69e17400b051fd2a7cb41de0a4bdb050b6
author Zack Williams <zdw@cs.arizona.edu> Fri Apr 21 13:57:14 2017 -0700
committer Zack Williams <zdw@cs.arizona.edu> Thu May 18 14:58:09 2017 -0700
tree cc2fd12ab7738f56180c07b7d2d9a71f0db63fa3
parent 4ef48392ffd9350ca407f047b63015d50401d351

Generate per-site SSL intermediate CA, fix cred/pki paths

Change-Id: I0bda0791d82142acac8c6af0e152d8d0954ef719

roles/juju-setup/defaults/main.yml

diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index 840f49d..3024e0e 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -1,12 +1,10 @@
 ---
 # juju-setup/defaults/main.yml
 
-juju_config_name: opencloud
-
 # note: juju_config_path and charm_versions are also set in
 # `juju-compute-setup/defaults/main.yml`.  Keep these in sync.
 
 juju_config_path: /usr/local/src/juju_config.yml
 charm_versions: {}
 
-pki_dir: "/opt/pki"
+pki_dir: "{{ playbook_dir }}/pki"