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/vars/opencloud_defaults.yml b/vars/opencloud_defaults.yml
index 32ca9a8..3f9bf90 100644
--- a/vars/opencloud_defaults.yml
+++ b/vars/opencloud_defaults.yml
@@ -1,10 +1,21 @@
---
# vars/opencloud_defaults.yml
+on_maas: false
+
+run_dist_upgrade: true
+
openstack_version: kilo
juju_config_name: opencloud
+apt_cacher_name: apt-cache
+
+xos_images:
+ - name: "trusty-server-multi-nic"
+ url: "http://www.vicci.org/opencloud/trusty-server-cloudimg-amd64-disk1.img"
+ checksum: "sha256:c2d0ffc937aeb96016164881052a496658efeb98959dc68e73d9895c5d9920f7"
+
charm_versions: {}
head_vm_list:
@@ -152,7 +163,7 @@
relations: [ "percona-cluster", "keystone", "nrpe", ]
- name: neutron-gateway
- relations: [ "neutron-api", "nova-cloud-controller", "percona-cluster", "nrpe", ]
+ relations: [ "neutron-api", "nova-cloud-controller", "nrpe", ]
- name: "neutron-gateway:amqp"
relations: [ "rabbitmq-server:amqp", ]
@@ -184,4 +195,16 @@
- name: "ceilometer:ceilometer-service"
relations: [ "ceilometer-agent:ceilometer-service", ]
+compute_relations:
+ - name: nova-compute
+ relations: [ "ceilometer-agent", "glance", "nova-cloud-controller", "nagios", "nrpe", ]
+
+ - name: "nova-compute:shared-db"
+ relations: [ "percona-cluster:shared-db", ]
+
+ - name: "nova-compute:amqp"
+ relations: [ "rabbitmq-server:amqp", ]
+
+ - name: ntp
+ relations: [ "nova-compute", ]