summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorNarinder Gupta <narinder.gupta@canonical.com>2016-03-24 14:48:28 -0500
committerNarinder Gupta <narinder.gupta@canonical.com>2016-03-24 14:48:28 -0500
commite29f5ffddb72fb8feb07a41cea7d4d6599f74287 (patch)
treed7efeecfea24ef429068ac7ebcb5d7b252afa518 /ci
parent88c125b7fb46f4b47d0fd2cf489234637405db30 (diff)
it seems heat charm is not designed to be HA.
Change-Id: I3f3bdcef3b444a226418520c5cb72bc8884ffcbf
Diffstat (limited to 'ci')
-rw-r--r--ci/odl/juju-deployer/ovs-odl-ha.yaml16
1 files changed, 8 insertions, 8 deletions
diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml
index df1ca889..85ee681c 100644
--- a/ci/odl/juju-deployer/ovs-odl-ha.yaml
+++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml
@@ -39,11 +39,11 @@ openstack-phase2:
options:
corosync_key: |
'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY='
- hacluster-heat:
- branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
- options:
- corosync_key: |
- 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkxMikuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gOTYwKS4KUHJlc3Mga2V5cyBvbiB5b3VyIGtleWJvYXJkIHRvIGdlbmVyYX'
+# hacluster-heat:
+# branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
+# options:
+# corosync_key: |
+# 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkxMikuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gOTYwKS4KUHJlc3Mga2V5cyBvbiB5b3VyIGtleWJvYXJkIHRvIGdlbmVyYX'
hacluster-horizon:
branch: "lp:~openstack-charmers/charms/trusty/hacluster/next"
options:
@@ -90,7 +90,7 @@ openstack-phase2:
branch: "lp:~openstack-charmers/charms/trusty/heat/next"
num_units: 3
options:
- vip: 10.4.1.18
+ #vip: 10.4.1.18
#os-public-hostname: api.public-fqdn
to:
- "lxc:nodes-api=0"
@@ -334,8 +334,8 @@ openstack-phase2:
- "hacluster-horizon:ha"
- - "ceilometer:ha"
- "hacluster-ceilometer:ha"
- - - "heat:ha"
- - "hacluster-heat:ha"
+# - - "heat:ha"
+# - "hacluster-heat:ha"
- - "neutron-api:neutron-plugin-api-subordinate"
- "neutron-api-odl:neutron-plugin-api-subordinate"
- - "nova-compute:neutron-plugin"