summaryrefslogtreecommitdiffstats
path: root/ci/opencontrail
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-06-21 05:13:27 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-06-21 05:14:30 -0500
commite00e92d2e9c1f33fe23e65169c475ba8cd6ab0ee (patch)
tree1139df51059a8099ec3ae26cee31682f93de7347 /ci/opencontrail
parent219b9ca055e3a298331c73c144560fa01cfababb (diff)
modified to include mysql as cluster service now.
Change-Id: I28454606832cb0798b3e4c144c0d0366468062d9 Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
Diffstat (limited to 'ci/opencontrail')
-rw-r--r--ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml6
1 files changed, 6 insertions, 0 deletions
diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
index 3db4270e..21676eba 100644
--- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
+++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml
@@ -135,6 +135,7 @@ contrail:
openstack-phase2:
inherits: openstack-phase1
relations:
+ - [ "mysql:ha", "hacluster-mysql:ha" ]
- [ "glance:ha", "hacluster-glance:ha" ]
- [ "keystone:ha", "hacluster-keystone:ha" ]
- [ "neutron-api:ha", "hacluster-neutron:ha" ]
@@ -233,6 +234,11 @@ openstack-phase2:
options:
corosync_key: |
'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg=='
+ hacluster-mysql:
+ charm: "local:trusty/hacluster"
+ options:
+ corosync_key: |
+ 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K'
ceilometer:
charm: "local:trusty/ceilometer"
num_units: 3