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

Change-Id: I0bda0791d82142acac8c6af0e152d8d0954ef719
diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index 159bd1b..d1607b8 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -28,7 +28,7 @@
 - name: Copy over juju-config.yml for configuring Juju services
   become: yes
   template:
-    src={{ juju_config_name }}_juju_config.yml.j2
+    src=juju_config.yml.j2
     dest={{ juju_config_path }}
 
 # check that containers are ready to be accessed, juju add-machine may error