From 11625a2c0c5349ebeaac29bdb69a4ab09794911a Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Wed, 29 Jun 2016 23:41:59 -0500 Subject: [PATCH] modified the cluster size to 3. Change-Id: I6d0e546e9a9d392f223619b9063ed1aad203a952 Signed-off-by: Narinder Gupta --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 9 ++++++++ ci/odl/juju-deployer/ovs-odl-ha.yaml | 10 ++++++++ ci/onos/juju-deployer/ovs-onos-ha.yaml | 27 ++++++++++++++++++++++ .../juju-deployer/ovs-opencontrail-ha.yaml | 23 +++++++----------- 4 files changed, 54 insertions(+), 15 deletions(-) diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 4f0c0a21..2112ab94 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -206,38 +206,47 @@ openstack-phase1: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-cinder: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-heat: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-horizon: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-ceilometer: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-nova: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-neutron: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-glance: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-mysql: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 relations: - - ntp:juju-info diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 96f9365f..ff8d8d17 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -225,42 +225,52 @@ openstack-phase1: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-cinder: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-heat: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-horizon: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-nova: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-neutron: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-glance: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-ceilometer: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-mysql: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 # hacluster-ceph-radosgw: # charm: "local:trusty/hacluster" # options: # corosync_transport: unicast +# cluster_count: 3 relations: - - "ntp:juju-info" - "nodes:juju-info" diff --git a/ci/onos/juju-deployer/ovs-onos-ha.yaml b/ci/onos/juju-deployer/ovs-onos-ha.yaml index 8a3ba240..d1f67970 100644 --- a/ci/onos/juju-deployer/ovs-onos-ha.yaml +++ b/ci/onos/juju-deployer/ovs-onos-ha.yaml @@ -55,7 +55,12 @@ openstack-phase1: - "lxc:nodes=0" heat: charm: "local:trusty/heat" + num_units: 3 + options: + vip: 10.4.1.18 to: + - "lxc:nodes=3" + - "lxc:nodes=4" - "lxc:nodes=0" ceph: charm: "local:trusty/ceph" @@ -93,6 +98,7 @@ openstack-phase1: charm: "local:trusty/cinder" num_units: 3 options: + vip: 10.4.1.19 block-device: None glance-api-version: 2 to: @@ -209,30 +215,47 @@ openstack-phase1: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-horizon: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-nova: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-neutron: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-glance: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-ceilometer: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 hacluster-mysql: charm: "local:trusty/hacluster" options: corosync_transport: unicast + cluster_count: 3 + hacluster-heat: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + cluster_count: 3 + hacluster-cinder: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + cluster_count: 3 relations: - - "ntp:juju-info" - "nodes:juju-info" @@ -250,6 +273,10 @@ openstack-phase1: - "hacluster-horizon:ha" - - "ceilometer:ha" - "hacluster-ceilometer:ha" + - - "heat:ha" + - "hacluster-heat:ha" + - - "cinder:ha" + - "hacluster-cinder:ha" openstack-phase2: inherits: openstack-phase1 diff --git a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml index 225090e5..18a80e24 100644 --- a/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/ovs-opencontrail-ha.yaml @@ -208,44 +208,37 @@ openstack-phase2: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' + cluster_count: 3 hacluster-horizon: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' + cluster_count: 3 hacluster-nova: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' - hacluster-neutron: + cluster_count: 3 + hacluster-neutron: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' + cluster_count: 3 hacluster-glance: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' + cluster_count: 3 hacluster-ceilometer: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' + cluster_count: 3 hacluster-mysql: charm: "local:trusty/hacluster" options: corosync_transport: unicast - corosync_key: | - 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K' + cluster_count: 3 ceilometer: charm: "local:trusty/ceilometer" num_units: 3 -- 2.16.6