From 20df8f79b08bf76452077cd42efd26f8670fe1d7 Mon Sep 17 00:00:00 2001 From: Narinder Gupta Date: Sat, 19 Dec 2015 16:28:17 -0600 Subject: [PATCH] Modified ovs-ha bundle to ha support for non SDN controller. Change-Id: I05bfb6bd21ec5117287465b84dc978d65cd44b08 --- ci/nosdn/juju-deployer/ovs-ha.yaml | 439 +++++++++++++++++++------------------ 1 file changed, 221 insertions(+), 218 deletions(-) diff --git a/ci/nosdn/juju-deployer/ovs-ha.yaml b/ci/nosdn/juju-deployer/ovs-ha.yaml index d814965f..a58e7217 100644 --- a/ci/nosdn/juju-deployer/ovs-ha.yaml +++ b/ci/nosdn/juju-deployer/ovs-ha.yaml @@ -19,290 +19,298 @@ openstack-phase1: - "nodes-compute:juju-info" openstack-phase2: inherits: openstack-phase1 - services: - "percona-cluster": - charm: "cs:trusty/percona-cluster" - num_units: 3 - options: - "dataset-size": 2G - "lp1366997-workaround": true - "max-connections": 10000 - "root-password": 293rhc395m - "sst-password": 127rc14t51 - vip: 10.4.1.15 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - "hacluster-keystone": - charm: "cs:trusty/hacluster" - options: - corosync_key: | - 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' - "hacluster-horizon": - charm: "cs:trusty/hacluster" - options: - corosync_key: | - 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' - "hacluster-nova": - charm: "cs:trusty/hacluster" - options: - corosync_key: | - 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' - "hacluster-neutron": - charm: "cs:trusty/hacluster" - options: - corosync_key: | - 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' - "hacluster-glance": - charm: "cs:trusty/hacluster" - options: - corosync_key: | - 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' - "hacluster-ceilometer": - charm: "cs:trusty/hacluster" - options: - corosync_key: | - 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' - "ceilometer": - branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" + services: + ceilometer: + charm: cs:trusty/ceilometer num_units: 3 - options: - vip: 10.4.1.14 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "ceilometer-agent": - branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" - "mongodb": - charm: "cs:trusty/mongodb" - num_units: 1 - to: - - "lxc:nodes-api=0" - heat: - branch: "lp:~openstack-charmers/charms/trusty/heat/next" - to: - - "lxc:nodes-api=0" + ceilometer-agent: + charm: cs:trusty/ceilometer-agent ceph: charm: cs:trusty/ceph num_units: 1 options: + monitor-count: 1 fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv - monitor-count: 1 - osd-reformat: 'no' + osd-reformat: 'yes' # ceph-cluster-network: 192.168.0.0/24 # ceph-public-network: 192.168.0.0/24 to: - "nodes-compute=0" -# - "nodes-compute=1" -# ceph-osd: -# charm: cs:trusty/ceph-osd -# num_units: 1 -# options: -# osd-devices: /dev/sdb -# osd-reformat: 'yes' -# to: -# - "lxc:nodes-api=0" -# ceph-radosgw: -# charm: cs:trusty/ceph-radosgw -# num_units: 1 -# options: -# use-embedded-webserver: true -# to: -# - "lxc:nodes-api=0" + ceph-osd: + charm: cs:trusty/ceph-osd + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=0" + - "nodes-api=1" + - "nodes-api=2" + ceph-radosgw: + charm: cs:trusty/ceph-radosgw + num_units: 3 + options: + use-embedded-webserver: true + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" cinder: charm: cs:trusty/cinder num_units: 3 options: block-device: None glance-api-version: 2 -# ha-mcastport: 5401 + ha-mcastport: 5401 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" cinder-ceph: charm: cs:trusty/cinder-ceph - "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + num_units: 0 + glance: + charm: cs:trusty/glance num_units: 3 + options: + ha-mcastport: 5402 + vip: 10.4.1.12 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "keystone": - branch: lp:charms/trusty/keystone + keystone: + charm: cs:trusty/keystone num_units: 3 - options: -# ha-mcastport: 5402 - "admin-password": openstack - "admin-token": admin + options: + admin-password: openstack + admin-token: admin + ha-mcastport: 5403 vip: 10.4.1.13 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + mongodb: + charm: cs:trusty/mongodb num_units: 3 - options: - secret: admin - vip: 10.4.1.11 - webroot: / to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "nova-compute": - branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 - options: - "enable-live-migration": False - "manage-neutron-plugin-legacy-mode": False - to: - - "nodes-compute=0" -# - "nodes-compute=1" -# - "nodes-api=0" -# - "nodes-api=1" -# - "nodes-api=2" - "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + mysql: + charm: cs:trusty/percona-cluster num_units: 3 - options: - "console-access-protocol": novnc - "network-manager": Neutron - "quantum-security-groups": "yes" - "service-guard": true - vip: 10.4.1.16 + options: + max-connections: 20000 + lp1366997-workaround: true + root-password: 293rhc395m + sst-password: 127rc14t51 + vip: 10.4.1.15 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - "neutron-api": - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next + neutron-api: + charm: cs:trusty/neutron-api num_units: 3 options: - neutron-security-groups: True - manage-neutron-plugin-legacy-mode: False + neutron-security-groups: true vip: 10.4.1.17 - to: + to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" neutron-gateway: - branch: lp:charms/trusty/neutron-gateway + charm: cs:trusty/neutron-gateway + num_units: 1 options: # "ext-port": "eth1" - to: + to: - "nodes-api=0" - "glance": - branch: lp:charms/trusty/glance + neutron-openvswitch: + charm: cs:trusty/neutron-openvswitch + num_units: 0 + nova-cloud-controller: + charm: cs:trusty/nova-cloud-controller num_units: 3 - options: - vip: 10.4.1.12 -# ha-mcastport: 5402 + options: + network-manager: Neutron + quantum-security-groups: 'yes' + service-guard: true + vip: 10.4.1.16 to: - "lxc:nodes-api=0" - "lxc:nodes-api=1" - "lxc:nodes-api=2" - neutron-openvswitch: - branch: lp:~openstack-charmers/charms/trusty/neutron-openvswitch/trunk + nova-compute: + charm: cs:trusty/nova-compute + num_units: 1 + options: + enable-live-migration: true + enable-resize: true + manage-neutron-plugin-legacy-mode: false + migration-auth-type: ssh + to: + - "nodes-compute=0" +# - "nodes-compute=1" +# - "nodes-api=0" +# - "nodes-api=1" +# - "nodes-api=2" + openstack-dashboard: + charm: cs:trusty/openstack-dashboard + num_units: 3 + options: + secret: admin + webroot: / + vip: 10.4.1.11 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + rabbitmq-server: + charm: cs:trusty/rabbitmq-server + num_units: 3 + to: + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" + - "lxc:nodes-api=2" + heat: + charm: cs:trusty/heat + to: + - "lxc:nodes-api=0" + hacluster-keystone: + charm: cs:trusty/hacluster + options: + corosync_key: | + 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' + hacluster-horizon: + charm: cs:trusty/hacluster + options: + corosync_key: | + 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' + hacluster-nova: + charm: cs:trusty/hacluster + options: + corosync_key: | + 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' + hacluster-neutron: + charm: cs:trusty/hacluster + options: + corosync_key: | + 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' + hacluster-glance: + charm: cs:trusty/hacluster + options: + corosync_key: | + 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' relations: - - - "glance:ha" - - "hacluster-glance:ha" - - - "keystone:ha" - - "hacluster-keystone:ha" - - - "neutron-api:ha" - - "hacluster-neutron:ha" - - - "nova-cloud-controller:ha" - - "hacluster-nova:ha" - - - "openstack-dashboard:ha" - - "hacluster-horizon:ha" - - - "ceilometer:ha" - - "hacluster-ceilometer:ha" + - - glance:ha + - hacluster-glance:ha + - - keystone:ha + - hacluster-keystone:ha + - - neutron-api:ha + - hacluster-neutron:ha + - - nova-cloud-controller:ha + - hacluster-nova:ha + - - openstack-dashboard:ha + - hacluster-horizon:ha + - - nova-compute:amqp + - rabbitmq-server:amqp + - - neutron-gateway:amqp + - rabbitmq-server:amqp + - - keystone:shared-db + - mysql:shared-db + - - nova-cloud-controller:identity-service + - keystone:identity-service + - - glance:identity-service + - keystone:identity-service + - - neutron-api:identity-service + - keystone:identity-service - - neutron-openvswitch:neutron-plugin-api - neutron-api:neutron-plugin-api + - - neutron-api:shared-db + - mysql:shared-db + - - neutron-api:amqp + - rabbitmq-server:amqp + - - neutron-gateway:neutron-plugin-api + - neutron-api:neutron-plugin-api + - - glance:shared-db + - mysql:shared-db + - - glance:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:image-service + - glance:image-service + - - nova-compute:image-service + - glance:image-service + - - nova-cloud-controller:cloud-compute + - nova-compute:cloud-compute + - - nova-cloud-controller:amqp + - rabbitmq-server:amqp + - - nova-cloud-controller:quantum-network-service + - neutron-gateway:quantum-network-service - - nova-compute:neutron-plugin - neutron-openvswitch:neutron-plugin - - neutron-openvswitch:amqp - rabbitmq-server:amqp - - - "keystone:shared-db" - - "percona-cluster:shared-db" - - - "nova-cloud-controller:shared-db" - - "percona-cluster:shared-db" - - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:image-service" - - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" - - - "nova-cloud-controller:cloud-compute" - - "nova-compute:cloud-compute" - - - "nova-compute:amqp" - - "rabbitmq-server:amqp" - - - "nova-compute:image-service" - - "glance:image-service" - - - "glance:shared-db" - - "percona-cluster:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" - - - "glance:amqp" - - "rabbitmq-server:amqp" - - - "openstack-dashboard:identity-service" - - "keystone:identity-service" - - - "neutron-api:shared-db" - - "percona-cluster:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" - - - "nova-cloud-controller:neutron-api" - - "neutron-api:neutron-api" - - - "neutron-api:identity-service" - - "keystone:identity-service" - - - "neutron-gateway:amqp" - - "rabbitmq-server:amqp" - - - "neutron-gateway:neutron-plugin-api" - - "neutron-api:neutron-plugin-api" - - - "nova-cloud-controller:quantum-network-service" - - "neutron-gateway:quantum-network-service" - - - "ceilometer:amqp" - - "rabbitmq-server:amqp" - - - "ceilometer-agent:ceilometer-service" - - "ceilometer:ceilometer-service" - - - "ceilometer:identity-service" - - "keystone:identity-service" - - - "ceilometer:identity-notifications" - - "keystone:identity-notifications" - - - "ceilometer-agent:nova-ceilometer" - - "nova-compute:nova-ceilometer" - - - "ceilometer:shared-db" - - "mongodb:database" - - - "heat:shared-db" - - "percona-cluster:shared-db" - - - "heat:identity-service" - - "keystone:identity-service" - - - "heat:amqp" - - "rabbitmq-server:amqp" - - - "cinder:image-service" - - "glance:image-service" - - - "cinder:amqp" - - "rabbitmq-server:amqp" - - - "cinder:identity-service" - - "keystone:identity-service" - - - "cinder:cinder-volume-service" - - "nova-cloud-controller:cinder-volume-service" - - - "cinder-ceph:storage-backend" - - "cinder:storage-backend" - - - "ceph:client" - - "nova-compute:ceph" - - - "cinder:shared-db" - - "percona-cluster:shared-db" - - - "ceph:client" - - "cinder-ceph:ceph" - - - "ceph:client" - - "glance:ceph" + - - openstack-dashboard:identity-service + - keystone:identity-service + - - nova-cloud-controller:shared-db + - mysql:shared-db + - - nova-cloud-controller:neutron-api + - neutron-api:neutron-api + - - cinder:image-service + - glance:image-service + - - cinder:amqp + - rabbitmq-server:amqp + - - cinder:identity-service + - keystone:identity-service + - - cinder:cinder-volume-service + - nova-cloud-controller:cinder-volume-service + - - cinder-ceph:storage-backend + - cinder:storage-backend + - - ceph:client + - nova-compute:ceph + - - cinder:shared-db + - mysql:shared-db + - - ceph:client + - cinder-ceph:ceph + - - ceph:client + - glance:ceph + - - ceph-osd:mon + - ceph:osd + - - ntp:juju-info + - nova-compute:juju-info + - - ntp:juju-info + - neutron-gateway:juju-info + - - ceph-radosgw:mon + - ceph:radosgw + - - ceph-radosgw:identity-service + - keystone:identity-service + - - ceilometer:amqp + - rabbitmq-server:amqp + - - ceilometer-agent:ceilometer-service + - ceilometer:ceilometer-service + - - ceilometer:identity-service + - keystone:identity-service + - - ceilometer:identity-notifications + - keystone:identity-notifications + - - ceilometer-agent:nova-ceilometer + - nova-compute:nova-ceilometer + - - ceilometer:shared-db + - mongodb:database + - - heat:shared-db + - mysql:shared-db + - - heat:identity-service + - keystone:identity-service + - - heat:amqp + - rabbitmq-server:amqp trusty-liberty-nodes: inherits: openstack-phase1 overrides: @@ -311,7 +319,6 @@ trusty-liberty-nodes: trusty-liberty: inherits: openstack-phase2 overrides: - cluster_count: 3 #os-data-network: 10.4.8.0/21 #prefer-ipv6: true region: Canonical @@ -328,7 +335,6 @@ trusty-kilo-nodes: trusty-kilo: inherits: openstack-phase2 overrides: - cluster_count: 3 #os-data-network: 10.4.8.0/21 #prefer-ipv6: true region: Canonical @@ -337,7 +343,6 @@ trusty-kilo: series: trusty ceph-osd-replication-count: 1 - trusty-juno-nodes: inherits: openstack-phase1 overrides: @@ -346,7 +351,6 @@ trusty-juno-nodes: trusty-juno: inherits: openstack-phase2 overrides: - cluster_count: 3 #os-data-network: 10.4.8.0/21 #prefer-ipv6: true region: Canonical @@ -355,4 +359,3 @@ trusty-juno: series: trusty ceph-osd-replication-count: 1 - -- 2.16.6