X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fodl%2Fjuju-deployer%2Fovs-odl-ha.yaml;h=be59ff6d75ec005ad2611187a1f483ef6ff90c84;hb=6635edf1ab2858d2a8b058450aecad6a9d9c5d88;hp=d28733405848d70702e7bb4a2331039e69b01eec;hpb=750dbf7f4631d025a1e6786489f80f702f47c89b;p=joid.git diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index d2873340..be59ff6d 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -1,223 +1,39 @@ # vim: set ts=2 et: +trusty-mitaka-nodes: + inherits: openstack-phase1 + overrides: + series: trusty + +trusty-mitaka: + inherits: openstack-phase2 + overrides: + #os-data-network: 10.4.8.0/21 + #ceph-cluster-network: 10.4.0.0/21 + #prefer-ipv6: true + #enable-dvr: true + #l2-population: true + region: Canonical + #source: "cloud:trusty-mitaka" + openstack-origin: "cloud:trusty-mitaka" + series: trusty + #ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin + openstack-phase1: series: trusty services: - nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" - num_units: 3 - constraints: tags=control - nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" - num_units: 1 - constraints: tags=compute - "ntp": - charm: "cs:trusty/ntp" + nodes: + charm: "cs:trusty/ubuntu" + num_units: 5 + ntp: + charm: "local:trusty/ntp" relations: - - "ntp:juju-info" - - "nodes-api:juju-info" - - - "ntp:juju-info" - - "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": - 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": - charm: "cs:trusty/ceilometer-agent" - "mongodb": - charm: "cs:trusty/mongodb" - num_units: 1 - to: - - "lxc:nodes-api=0" -# ceph: -# charm: cs:trusty/ceph -# num_units: 1 -# options: -# fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 -# monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== -# osd-devices: /dev/sdb -# osd-reformat: 'yes' -# source: cloud:trusty-kilo -# to: -# - "nodes-compute=0" -# ceph-osd: -# charm: cs:trusty/ceph-osd -# num_units: 1 -# options: -# osd-devices: /dev/sdb -# osd-reformat: 'yes' -# source: cloud:trusty-kilo -# to: -# - "lxc:nodes-api=0" -# ceph-radosgw: -# charm: cs:trusty/ceph-radosgw -# num_units: 1 -# options: -# source: cloud:trusty-kilo -# use-embedded-webserver: true -# to: -# - "lxc:nodes-api=0" -# cinder: -# charm: cs:trusty/cinder -# num_units: 1 -# options: -# block-device: None -# glance-api-version: 2 -# ha-mcastport: 5401 -# to: -# - "lxc:nodes-api=0" -# cinder-ceph: -# charm: cs:trusty/cinder-cep - "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server - num_units: 3 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - "keystone": - branch: lp:charms/trusty/keystone - num_units: 3 - options: - "admin-password": openstack - "admin-token": admin - 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 - 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 - num_units: 3 - options: - "console-access-protocol": novnc - "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-api": - branch: lp:~openstack-charmers/charms/trusty/neutron-api/next - num_units: 3 - options: - neutron-security-groups: True - manage-neutron-plugin-legacy-mode: False - vip: 10.4.1.17 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - neutron-gateway: - branch: lp:charms/trusty/neutron-gateway - options: -# "ext-port": "eth1" - plugin: ovs-odl - instance-mtu: 1400 - to: - - "nodes-api=0" - odl-controller: - branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk - options: - install-url: "https://nexus.opendaylight.org/content/groups/public/org/opendaylight/integration/distribution-karaf/0.2.4-Helium-SR4/distribution-karaf-0.2.4-Helium-SR4.tar.gz" -# install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.3.2-Lithium-SR2/distribution-karaf-0.3.2-Lithium-SR2.tar.gz" - http-proxy: "http://squid.internal:3128" - https-proxy: "http://squid.internal:3128" + - "nodes:juju-info" - to: - - "lxc:nodes-api=1" - "glance": - branch: lp:charms/trusty/glance - num_units: 3 - options: - vip: 10.4.1.12 - to: - - "lxc:nodes-api=0" - - "lxc:nodes-api=1" - - "lxc:nodes-api=2" - neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp - options: - overlay-network-type: 'vxlan gre' - security-groups: True - openvswitch-odl: - branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk +openstack-phase2: + inherits: openstack-phase1 relations: - - "glance:ha" - "hacluster-glance:ha" @@ -231,6 +47,12 @@ openstack-phase2: - "hacluster-horizon:ha" - - "ceilometer:ha" - "hacluster-ceilometer:ha" + - - "cinder:ha" + - "hacluster-cinder:ha" + - - "heat:ha" + - "hacluster-heat:ha" +# - - "ceph-radosgw:ha" +# - "hacluster-ceph-radosgw:ha" - - "neutron-api:neutron-plugin-api-subordinate" - "neutron-api-odl:neutron-plugin-api-subordinate" - - "nova-compute:neutron-plugin" @@ -279,63 +101,307 @@ openstack-phase2: - "neutron-api:neutron-plugin-api" - - "nova-cloud-controller:quantum-network-service" - "neutron-gateway:quantum-network-service" - - - "ceilometer" - - "mongodb" - - - "ceilometer" - - "rabbitmq-server" + - - "ceilometer:amqp" + - "rabbitmq-server:amqp" + - - "ceilometer-agent:ceilometer-service" + - "ceilometer:ceilometer-service" - - "ceilometer:identity-service" - "keystone:identity-service" - - - "ceilometer" + - - "ceilometer:identity-notifications" - "keystone:identity-notifications" - - - "ceilometer-agent" - - "nova-compute" - - - "ceilometer:ceilometer-service" - - "ceilometer-agent:ceilometer-service" - -trusty-liberty-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-liberty: - inherits: openstack-phase2 - overrides: - cluster_count: 3 - #os-data-network: 10.4.8.0/21 - region: Canonical - source: "cloud:trusty-liberty" - "openstack-origin": "cloud:trusty-liberty" - series: trusty - -trusty-kilo-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-kilo: - inherits: openstack-phase2 - overrides: - cluster_count: 3 - #os-data-network: 10.4.8.0/21 - region: Canonical - source: "cloud:trusty-kilo" - "openstack-origin": "cloud:trusty-kilo" - series: trusty - - -trusty-juno-nodes: - inherits: openstack-phase1 - overrides: - series: trusty - -trusty-juno: - inherits: openstack-phase2 - overrides: - cluster_count: 3 - #os-data-network: 10.4.8.0/21 - region: Canonical - source: "cloud:trusty-juno" - "openstack-origin": "cloud:trusty-juno" - series: trusty - - + - - "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" + - - "ceph-osd:mon" + - "ceph:osd" + - - "ceph-radosgw:mon" + - "ceph:radosgw" + - - "ceph-radosgw:identity-service" + - "keystone:identity-service" + #- - nova-compute:lxd + #- lxd:lxd + - - congress:shared-db + - mysql:shared-db + - - congress:identity-service + - keystone:identity-service + - - congress:amqp + - rabbitmq-server:amqp + services: + hacluster-keystone: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' + hacluster-cinder: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'cc6n5Zv6M2mQ2mUhTx/aKoImQ7q77pKDdkSwBUG5VqoSb23SxnGUsAxH5E8lOeCZ84EURzS71FEb8F9P5YY+2deh0+tdXukoKTugdVmJfarahPpWpEEZRRCigUngdFw/479FOcFCkN1SJtQNqWi1ACYSn1/GRoQ2vP+2byrkV6E=' + hacluster-heat: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'tNeFXmOqzytRq7loxLMDaaMqZZXjC7BNfMbcKxSNeIPyBj4lkJwHZyuV7mo0ogzcfVJqLBHBULai+ed9uyWCZJxLXoi+WwTj5AqcXfxfSo9vLCthukJJ4zuKvzeGibZRszwINf32RW9jtXSCPosv8a+9MSg49KD1c9fS20aEuIM=' + hacluster-horizon: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' + hacluster-nova: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' + hacluster-neutron: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' + hacluster-glance: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' + hacluster-ceilometer: + charm: "local:trusty/hacluster" + options: + corosync_key: | + 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' +# hacluster-ceph-radosgw: +# charm: "local:trusty/hacluster" +# options: +# corosync_key: | +# 'tk8U/FkH1+dNsvj6IU0C8AST7i/9ylIoCD8kWpPjB+UE2AYR7tkgkjnc4m5dzIYPYTceY7Hnb9xLJ0nlcQLYYFBRAJOg3drNTcVrfh63y9g9La1J1r51YSbOqXq1Q6RUhxP4OQBtDGE6/4NtZwuRPvPGLcI2ENiVm78l8JFkXRw=' + percona-cluster: + charm: "local: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=0" + - "lxc:nodes=1" + - "lxc:nodes=2" + ceilometer: + charm: "local:trusty/ceilometer" + num_units: 3 + options: + vip: 10.4.1.14 + #os-public-hostname: api.public-fqdn + to: + - "lxc:nodes=1" + - "lxc:nodes=2" + - "lxc:nodes=3" + ceilometer-agent: + charm: "local:trusty/ceilometer-agent" + mongodb: + charm: "local:trusty/mongodb" + to: + - "lxc:nodes=0" + heat: + charm: "local:trusty/heat" + num_units: 3 + options: + vip: 10.4.1.18 + #os-public-hostname: api.public-fqdn + to: + - "lxc:nodes=2" + - "lxc:nodes=3" + - "lxc:nodes=4" + ceph: + charm: local:trusty/ceph + num_units: 3 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: "" + monitor-count: 3 +# osd-reformat: 'false' +# ceph-cluster-network: 192.168.0.0/24 +# ceph-public-network: 192.168.0.0/24 + to: + - "lxc:nodes=3" + - "lxc:nodes=4" + - "lxc:nodes=0" + ceph-osd: + charm: local:trusty/ceph-osd + num_units: 3 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes=2" + - "nodes=3" + - "nodes=4" +# - "nodes=0" + ceph-radosgw: + charm: local:trusty/ceph-radosgw +# vip: 10.4.1.10 + #os-public-hostname: api.public-fqdn + options: + use-embedded-webserver: true + operator-roles: "Member,admin" + to: + - "lxc:nodes=0" +# - "lxc:nodes=1" +# - "lxc:nodes=2" + cinder: + charm: local:trusty/cinder + num_units: 3 + options: + block-device: None + glance-api-version: 2 + vip: 10.4.1.19 + #os-public-hostname: api.public-fqdn +# ha-mcastport: 5401 + to: + - "lxc:nodes=4" + - "lxc:nodes=0" + - "lxc:nodes=1" + cinder-ceph: + charm: local:trusty/cinder-ceph + rabbitmq-server: + charm: local:trusty/rabbitmq-server + num_units: 3 + to: + - "lxc:nodes=0" + - "lxc:nodes=1" + - "lxc:nodes=2" + keystone: + charm: local:trusty/keystone + num_units: 3 + options: +# ha-mcastport: 5402 + admin-password: openstack + admin-token: admin + vip: 10.4.1.13 + #os-public-hostname: api.public-fqdn + to: + - "lxc:nodes=1" + - "lxc:nodes=2" + - "lxc:nodes=3" + openstack-dashboard: + charm: local:trusty/openstack-dashboard + num_units: 3 + options: + secret: admin + vip: 10.4.1.11 + webroot: / + to: + - "lxc:nodes=2" + - "lxc:nodes=3" + - "lxc:nodes=4" + nova-compute: + charm: local:trusty/nova-compute + num_units: 4 + options: + enable-live-migration: true + enable-resize: true + manage-neutron-plugin-legacy-mode: false + migration-auth-type: ssh + #virt-type: lxd + #hugepages: "50%" + to: + - "nodes=1" + - "nodes=2" + - "nodes=3" + - "nodes=4" + nova-cloud-controller: + charm: local:trusty/nova-cloud-controller + num_units: 3 + options: + console-access-protocol: novnc + network-manager: Neutron + service-guard: true + vip: 10.4.1.16 + #os-public-hostname: api.public-fqdn + to: + - "lxc:nodes=3" + - "lxc:nodes=4" + - "lxc:nodes=0" + neutron-api: + charm: local:trusty/neutron-api + num_units: 3 + options: + neutron-security-groups: True + flat-network-providers: "*" + vip: 10.4.1.17 + #os-public-hostname: api.public-fqdn + to: + - "lxc:nodes=4" + - "lxc:nodes=0" + - "lxc:nodes=1" + neutron-gateway: + charm: local:trusty/neutron-gateway + options: + #ext-port: "eth1" + plugin: ovs-odl + instance-mtu: 1400 + to: + - "nodes=0" + odl-controller: + charm: local:trusty/odl-controller + options: + install-url: "https://nexus.opendaylight.org/content/repositories/opendaylight.release/org/opendaylight/integration/distribution-karaf/0.4.2-Beryllium-SR2/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz" + profile: "openvswitch-odl-beryllium" + http-proxy: "http://squid.internal:3128" + https-proxy: "http://squid.internal:3128" + to: + - "lxc:nodes=0" + glance: + charm: local:trusty/glance + num_units: 3 + options: + vip: 10.4.1.12 + #os-public-hostname: api.public-fqdn +# ha-mcastport: 5402 + to: + - "lxc:nodes=0" + - "lxc:nodes=1" + - "lxc:nodes=2" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + to: + - "lxc:nodes=0" + neutron-api-odl: + charm: local:trusty/neutron-api-odl + options: + overlay-network-type: 'vxlan' + security-groups: True + openvswitch-odl: + charm: local:trusty/openvswitch-odl + congress: + charm: local:trusty/congress + options: + source-branch: stable/mitaka + to: + - "lxc:nodes=0"