| commit | 7928696d6b62a4cd1eea2e50e3e449c884dcfbc9 | [log] [tgz] |
|---|---|---|
| author | Zack Williams <zdw@cs.arizona.edu> | Mon Jul 10 12:24:37 2017 -0700 |
| committer | Zack Williams <zdw@cs.arizona.edu> | Wed Jul 12 11:06:28 2017 -0700 |
| tree | 71c9528a16fd171ebe808c877e9fdb1acec5997f | |
| parent | cc3fee4b8ef1a9d4782a411e628f06a895c2470d [diff] |
[CORD-1530] Make config file directory creation using become an optional step Cleanup various incongruities in defaults Change-Id: I6fb77ab1ccdf08a18468adbc59474f94d603fc11
diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml index a9c7e81..e01d658 100644 --- a/roles/juju-setup/defaults/main.yml +++ b/roles/juju-setup/defaults/main.yml
@@ -8,6 +8,7 @@ charm_versions: {} pki_dir: "{{ playbook_dir }}/pki" +credentials_dir: "{{ playbook_dir }}/credentials" site_name: placeholder-sitename site_suffix: "{{ site_name }}.test"
diff --git a/roles/juju-setup/templates/juju_config.yml.j2 b/roles/juju-setup/templates/juju_config.yml.j2 index bf157ea..e91e5c2 100644 --- a/roles/juju-setup/templates/juju_config.yml.j2 +++ b/roles/juju-setup/templates/juju_config.yml.j2
@@ -54,7 +54,8 @@ openstack-origin: "cloud:trusty-kilo" percona-cluster: - max-connections: 20000 + max-connections: 5000 + innodb-buffer-pool-size: "20%" rabbitmq-server: ssl: "on"