summaryrefslogtreecommitdiffstats
path: root/ci/onos/juju-deployer/ovs-onos-ha.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'ci/onos/juju-deployer/ovs-onos-ha.yaml')
-rw-r--r--ci/onos/juju-deployer/ovs-onos-ha.yaml27
1 files changed, 19 insertions, 8 deletions
diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml
index 0d7a2b9f..120ed3cd 100644
--- a/ci/onos/juju-deployer/ovs-onos-ha.yaml
+++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml
@@ -58,9 +58,9 @@ openstack-phase2:
- - "neutron-api-onos:onos-controller"
- "onos-controller:controller-api"
- - "keystone:shared-db"
- - "percona-cluster:shared-db"
+ - "mysql:shared-db"
- - "nova-cloud-controller:shared-db"
- - "percona-cluster:shared-db"
+ - "mysql:shared-db"
- - "nova-cloud-controller:amqp"
- "rabbitmq-server:amqp"
- - "nova-cloud-controller:image-service"
@@ -74,7 +74,7 @@ openstack-phase2:
- - "nova-compute:image-service"
- "glance:image-service"
- - "glance:shared-db"
- - "percona-cluster:shared-db"
+ - "mysql:shared-db"
- - "glance:identity-service"
- "keystone:identity-service"
- - "glance:amqp"
@@ -82,7 +82,7 @@ openstack-phase2:
- - "openstack-dashboard:identity-service"
- "keystone:identity-service"
- - "neutron-api:shared-db"
- - "percona-cluster:shared-db"
+ - "mysql:shared-db"
- - "neutron-api:amqp"
- "rabbitmq-server:amqp"
- - "nova-cloud-controller:neutron-api"
@@ -108,7 +108,7 @@ openstack-phase2:
- - "ceilometer:shared-db"
- "mongodb:database"
- - "heat:shared-db"
- - "percona-cluster:shared-db"
+ - "mysql:shared-db"
- - "heat:identity-service"
- "keystone:identity-service"
- - "heat:amqp"
@@ -126,7 +126,7 @@ openstack-phase2:
- - "ceph:client"
- "nova-compute:ceph"
- - "cinder:shared-db"
- - "percona-cluster:shared-db"
+ - "mysql:shared-db"
- - "ceph:client"
- "cinder-ceph:ceph"
- - "ceph:client"
@@ -139,7 +139,12 @@ openstack-phase2:
- "keystone:identity-service"
#- - nova-compute:lxd
#- lxd:lxd
-
+ - - congress:shared-db
+ - mysql:shared-db
+ - - congress:identity-service
+ - keystone:identity-service
+ - - congress:amqp
+ - rabbitmq-server:amqp
services:
hacluster-keystone:
charm: "local:trusty/hacluster"
@@ -171,7 +176,7 @@ openstack-phase2:
options:
corosync_key: |
'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
- percona-cluster:
+ mysql:
charm: "local:trusty/percona-cluster"
num_units: 3
options:
@@ -355,3 +360,9 @@ openstack-phase2:
security-groups: True
openvswitch-onos:
charm: "local:trusty/openvswitch-onos"
+ congress:
+ charm: local:trusty/congress
+ options:
+ source-branch: stable/liberty
+ to:
+ - "lxc:nodes=0"