From b58f01b1b21427d16bc9a991704884ef7421cc90 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Mon, 27 Jun 2016 14:58:31 -0500 Subject: modfied to include the os qualified domain name for public API. Change-Id: If169aab5f81fc0b6a112068066815e194f8f9e36 Signed-off-by: Narinder Gupta --- ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml | 50 ++++++++++++++++++++++++++--- ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml | 3 -- ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml | 1 - 3 files changed, 46 insertions(+), 8 deletions(-) (limited to 'ci/nosdn') diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml index 9e5c901c..b4ab8bfc 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-ha.yaml @@ -16,6 +16,8 @@ trusty-mitaka: #ceph-osd-replication-count: 2 admin-role: admin keystone-admin-role: admin + use-internal-endpoints: true + #os-public-hostname: pod.maas openstack-phase1: services: @@ -43,6 +45,12 @@ openstack-phase2: - hacluster-nova:ha - - openstack-dashboard:ha - hacluster-horizon:ha + - - ceilometer:ha + - hacluster-ceilometer:ha + - - cinder:ha + - hacluster-cinder:ha + - - heat:ha + - hacluster-heat:ha - - nova-compute:amqp - rabbitmq-server:amqp - - neutron-gateway:amqp @@ -146,36 +154,62 @@ openstack-phase2: hacluster-keystone: charm: "local:trusty/hacluster" options: + corosync_transport: unicast corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' + hacluster-cinder: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + corosync_key: | + 'cc6n5Zv6M2mQ2mUhTx/aKoImQ7q77pKDdkSwBUG5VqoSb23SxnGUsAxH5E8lOeCZ84EURzS71FEb8F9P5YY+2deh0+tdXukoKTugdVmJfarahPpWpEEZRRCigUngdFw/479FOcFCkN1SJtQNqWi1ACYSn1/GRoQ2vP+2byrkV6E=' + hacluster-heat: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + corosync_key: | + 'tNeFXmOqzytRq7loxLMDaaMqZZXjC7BNfMbcKxSNeIPyBj4lkJwHZyuV7mo0ogzcfVJqLBHBULai+ed9uyWCZJxLXoi+WwTj5AqcXfxfSo9vLCthukJJ4zuKvzeGibZRszwINf32RW9jtXSCPosv8a+9MSg49KD1c9fS20aEuIM=' hacluster-horizon: charm: "local:trusty/hacluster" options: + corosync_transport: unicast corosync_key: | 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' + hacluster-ceilometer: + charm: "local:trusty/hacluster" + options: + corosync_transport: unicast + corosync_key: | + 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' hacluster-nova: charm: "local:trusty/hacluster" options: + corosync_transport: unicast corosync_key: | 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' hacluster-neutron: charm: "local:trusty/hacluster" options: + corosync_transport: unicast corosync_key: | 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' hacluster-glance: charm: "local:trusty/hacluster" options: + corosync_transport: unicast corosync_key: | 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' hacluster-mysql: charm: "local:trusty/hacluster" options: + corosync_transport: unicast corosync_key: | 'Q29yb3N5bmMgQ2x1c3RlciBFbmdpbmUgQXV0aGVudGljYXRpb24ga2V5IGdlbmVyYXRvci4KR2F0aGVyaW5nIDEwMjQgYml0cyBmb3Iga2V5IGZyb20gL2Rldi9yYW5kb20uClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5LgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDkyMCkuClByZXNzIGtleXMgb24geW91ciBrZXlib2FyZCB0byBnZW5lcmF0ZSBlbnRyb3B5IChiaXRzID0gMTAwMCkuCldyaXRpbmcgY29yb3N5bmMga2V5IHRvIC9ldGMvY29yb3N5bmMvYXV0aGtleS4K' ceilometer: charm: "local:trusty/ceilometer" num_units: 3 + options: + vip: 10.4.1.14 to: - "lxc:nodes=0" - "lxc:nodes=1" @@ -219,7 +253,7 @@ openstack-phase2: options: block-device: None glance-api-version: 2 - ha-mcastport: 5401 + vip: 10.4.1.19 to: - "lxc:nodes=2" - "lxc:nodes=3" @@ -230,7 +264,6 @@ openstack-phase2: charm: "local:trusty/glance" num_units: 3 options: - ha-mcastport: 5402 vip: 10.4.1.12 to: - "lxc:nodes=3" @@ -246,7 +279,6 @@ openstack-phase2: options: admin-password: openstack admin-token: admin - ha-mcastport: 5403 vip: 10.4.1.13 to: - "lxc:nodes=4" @@ -260,6 +292,7 @@ openstack-phase2: charm: "local:trusty/percona-cluster" num_units: 3 options: + min-cluster-size: 3 max-connections: 20000 lp1366997-workaround: true root-password: 293rhc395m @@ -300,6 +333,7 @@ openstack-phase2: num_units: 3 options: console-access-protocol: novnc + #console-proxy-ip: pod.maas network-manager: Neutron service-guard: true vip: 10.4.1.16 @@ -329,6 +363,7 @@ openstack-phase2: secret: admin webroot: / vip: 10.4.1.11 + endpoint-type: internalURL to: - "lxc:nodes=3" - "lxc:nodes=4" @@ -336,14 +371,21 @@ openstack-phase2: rabbitmq-server: charm: "local:trusty/rabbitmq-server" num_units: 3 + options: + vip: 10.4.1.10 to: - "lxc:nodes=4" - "lxc:nodes=0" - "lxc:nodes=1" heat: charm: "local:trusty/heat" + num_units: 3 + options: + vip: 10.4.1.18 to: - - "lxc:nodes=0" + - "lxc:nodes=2" + - "lxc:nodes=3" + - "lxc:nodes=4" congress: charm: local:trusty/congress options: diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml index 90ac3291..1442ea7e 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-nonha.yaml @@ -170,7 +170,6 @@ openstack-phase2: options: block-device: None glance-api-version: 2 - ha-mcastport: 5401 to: - "lxc:nodes=1" cinder-ceph: @@ -178,7 +177,6 @@ openstack-phase2: glance: charm: "local:trusty/glance" options: - ha-mcastport: 5402 to: - "lxc:nodes=0" opnfv-promise: @@ -190,7 +188,6 @@ openstack-phase2: options: admin-password: openstack admin-token: admin - ha-mcastport: 5403 to: - "lxc:nodes=0" mongodb: diff --git a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml index 38d975c6..be5cc4d1 100644 --- a/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml +++ b/ci/nosdn/juju-deployer/ovs-nosdn-tip.yaml @@ -181,7 +181,6 @@ openstack-phase2: options: block-device: None glance-api-version: 2 -# ha-mcastport: 5401 # openstack-origin-git: include-file://cinder-master.yaml to: - "lxc:nodes=1" -- cgit 1.2.3-korg