made it run, ssh key issues
fix user/root difference, lint
lint, make 'apt-get dist-upgrade' an option, formatting
add more missing things
remove extraneous keystone pw
remove database relation to neutron-gateway which is no longer required
fixed roles so async resumption only happens when those VMs exist
workaround for old Jinja
add missing compute relations and variables
whitespace
Change-Id: I323806ea2594bb70fb95a6d11a489625f59ac0da
diff --git a/roles/juju-setup/defaults/main.yml b/roles/juju-setup/defaults/main.yml
index bbbb92e..c6ad753 100644
--- a/roles/juju-setup/defaults/main.yml
+++ b/roles/juju-setup/defaults/main.yml
@@ -1,6 +1,10 @@
---
+# juju-setup/defaults/main.yml
juju_config_name: opencloud
-juju_config_path: /usr/local/src/juju_config.yml
+# 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: {}
diff --git a/roles/juju-setup/tasks/main.yml b/roles/juju-setup/tasks/main.yml
index 0bb3d18..6bd790d 100644
--- a/roles/juju-setup/tasks/main.yml
+++ b/roles/juju-setup/tasks/main.yml
@@ -94,7 +94,7 @@
register: result
until: result | success
retries: 40
- delay: 15
+ delay: 15
- name: Copy cert to system location
become: yes
diff --git a/roles/juju-setup/templates/opencloud_juju_config.yml.j2 b/roles/juju-setup/templates/opencloud_juju_config.yml.j2
index 7911828..4345b19 100644
--- a/roles/juju-setup/templates/opencloud_juju_config.yml.j2
+++ b/roles/juju-setup/templates/opencloud_juju_config.yml.j2
@@ -45,7 +45,6 @@
nova-compute:
virt-type: kvm
config-flags: "firewall_driver=nova.virt.firewall.NoopFirewallDriver"
- disable-neutron-security-groups: "True"
openstack-origin: "cloud:trusty-kilo"
nrpe: {}