X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=ci%2Fodl%2Fjuju-deployer%2Fovs-odl-ha.yaml;h=4bfb5027ebd13bf19e83897f5ad3f6eb8380f156;hb=4670f8c27934ddc9b5b3bb614f552bdf0bf4b142;hp=740cb16a3cd9c02dd2511b3e3797a92c6417db90;hpb=c1b2ce98a0dd9093216e71ed97117fbd0c4d2294;p=joid.git diff --git a/ci/odl/juju-deployer/ovs-odl-ha.yaml b/ci/odl/juju-deployer/ovs-odl-ha.yaml index 740cb16a..4bfb5027 100644 --- a/ci/odl/juju-deployer/ovs-odl-ha.yaml +++ b/ci/odl/juju-deployer/ovs-odl-ha.yaml @@ -3,12 +3,12 @@ openstack-phase1: series: trusty services: nodes-api: - charm: "local:trusty/ubuntu-nodes-controller" + charm: "cs:trusty/ubuntu" num_units: 3 constraints: tags=control nodes-compute: - charm: "local:trusty/ubuntu-nodes-compute" - num_units: 1 + charm: "cs:trusty/ubuntu" + num_units: 2 constraints: tags=compute "ntp": charm: "cs:trusty/ntp" @@ -21,7 +21,7 @@ openstack-phase2: inherits: openstack-phase1 services: "percona-cluster": - charm: "cs:trusty/percona-cluster" + branch: "lp:~openstack-charmers/charms/trusty/percona-cluster/next" num_units: 3 options: "dataset-size": 2G @@ -31,45 +31,114 @@ openstack-phase2: "sst-password": 127rc14t51 vip: 10.4.1.15 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "hacluster-keystone": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'QisjNpoKHLkvyc3PEdDHP5VZjgD0kOk9t0ABPWmCELlu5AgWgnW6bJd34BVXO7VhW+3ZwNQM3W+bZ3pl28ftY4ki4N/S0KLFNia5egFgiA3AH2QXLnokS7OYXuu6GMJJ1S5mDe6P5zU+tfJe/Mebq24u7CgR0gAvohSPRdDTwdY=' "hacluster-horizon": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'aCVPHw6XYne+Hxv0WPiM3+yEfeIxs0Ly0EMKB494Rdzjf5rE52GcXqqxuvIa/nXJ4GCR+UdKk9FEwcASfYkeu3HDWUld9uTE6pOc+ibWYnybNH7VBfEHW8h9YmQKs3HD2T3wlTcS2irU4CUW7/IKNok4etYdM3iFn1K2ReSGXEI=' "hacluster-nova": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'gel86qmEze8dYKYbfqIgRpqapJpKtdYL2hxC1y5nWYBPq7EMf6V8mF01IjeUkSRs14CUDrsPpT4PWeom7EOY2fleuLx/aIuqQUfEDkhf/gvaz7BaU4hrmTCoDBK7/HvEwY+/wu4qkEeckzSRPsm9MYzqnLRshh8yjZJ70xU/mmk=' "hacluster-neutron": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'KNhb4++3jlllbnscS5D3qdzOJDsQPEeZ7zOLZJHbkKrRjX9gRCijVVOiv2JCvq03HqQ7LIufQzWGl9Za8qh0f6QmQ3XhFh/Cb/3WaYFj+tEf0zArWv+8miswmM1z4eyTSrTWBq0dTgx1z96wjBxP5HV0+1LWW+3Ei4oZWyRGeR0=' "hacluster-glance": - charm: "cs:trusty/hacluster" + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" options: corosync_key: | 'el1dd8107J5mwQDPS7tEJPZrr0XFfL95+Tku/QG90W5Q5f5SP4W8TRfKvddGmZWZl2lVd1neG5WqaHa1mq/aScJpoflzVAJCvshN7Gd2AjHhLNNugeI8S90j/7wrKUhqiCAlkKaeri2xs5bB5PZ7Z9AHuNZL7SW1al8lxrKhUFI=' - "rabbitmq-server": - branch: lp:charms/trusty/rabbitmq-server + "hacluster-ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/hacluster/next" + options: + corosync_key: | + 'cHkgKGJpdHMgPSA5NjApLgpQcmVzcyBrZXlzIG9uIHlvdXIga2V5Ym9hcmQgdG8gZ2VuZXJhdGUgZW50cm9weSAoYml0cyA9IDEwMDgpLgpXcml0aW5nIGNvcm9zeW5jIGtleSB0byAvZXRjL2Nvcm9zeW5jL2F1dGhrZXkuCg==' + "ceilometer": + branch: "lp:~openstack-charmers/charms/trusty/ceilometer/next" num_units: 3 + options: + vip: 10.4.1.14 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" + "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" + ceph: + branch: lp:~openstack-charmers/charms/trusty/ceph/next + num_units: 2 + options: + fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 + monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== + osd-devices: /srv + monitor-count: 1 + osd-reformat: 'false' +# 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: + branch: lp:~openstack-charmers/charms/trusty/ceph-osd/next + num_units: 1 + options: + osd-devices: /srv + osd-reformat: 'yes' + to: + - "nodes-api=1" + ceph-radosgw: + branch: lp:~openstack-charmers/charms/trusty/ceph-radosgw/next + num_units: 1 + options: + use-embedded-webserver: true + operator-roles: "Member,admin" + to: + - "lxc:nodes-api=0" + cinder: + branch: lp:~openstack-charmers/charms/trusty/cinder/next + num_units: 3 + options: + block-device: None + glance-api-version: 2 +# ha-mcastport: 5401 + to: + - "lxc:nodes-api=1" + - "lxc:nodes-api=0" + - "lxc:nodes-api=2" + cinder-ceph: + branch: lp:~openstack-charmers/charms/trusty/cinder-ceph/next + "rabbitmq-server": + branch: lp:~openstack-charmers/charms/trusty/rabbitmq-server/next + num_units: 3 + to: - "lxc:nodes-api=2" + - "lxc:nodes-api=0" + - "lxc:nodes-api=1" "keystone": - branch: lp:charms/trusty/keystone + branch: lp:~openstack-charmers/charms/trusty/keystone/next num_units: 3 options: +# ha-mcastport: 5402 "admin-password": openstack "admin-token": admin vip: 10.4.1.13 @@ -78,30 +147,30 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=2" "openstack-dashboard": - branch: lp:charms/trusty/openstack-dashboard + branch: lp:~openstack-charmers/charms/trusty/openstack-dashboard/next num_units: 3 options: secret: admin vip: 10.4.1.11 webroot: / to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 4 + num_units: 2 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" + - "nodes-compute=1" +# - "nodes-api=0" +# - "nodes-api=1" +# - "nodes-api=2" "nova-cloud-controller": - branch: lp:charms/trusty/nova-cloud-controller + branch: lp:~openstack-charmers/charms/trusty/nova-cloud-controller/next num_units: 3 options: "console-access-protocol": novnc @@ -110,9 +179,9 @@ openstack-phase2: "service-guard": true vip: 10.4.1.16 to: + - "lxc:nodes-api=2" - "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 @@ -125,7 +194,7 @@ openstack-phase2: - "lxc:nodes-api=1" - "lxc:nodes-api=2" neutron-gateway: - branch: lp:charms/trusty/neutron-gateway + branch: lp:~openstack-charmers/charms/trusty/neutron-gateway/next options: # "ext-port": "eth1" plugin: ovs-odl @@ -133,29 +202,35 @@ openstack-phase2: to: - "nodes-api=0" odl-controller: - branch: lp:~sdn-charmers/charms/trusty/odl-controller/trunk + branch: lp:~openstack-charmers/charms/trusty/odl-controller/next 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" + #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/groups/public/org/opendaylight/integration/distribution-karaf/0.3.3-Lithium-SR3/distribution-karaf-0.3.3-Lithium-SR3.tar.gz" + profile: "openvswitch-odl-lithium" http-proxy: "http://squid.internal:3128" https-proxy: "http://squid.internal:3128" - to: - "lxc:nodes-api=1" "glance": - branch: lp:charms/trusty/glance + branch: lp:~openstack-charmers/charms/trusty/glance/next num_units: 3 options: vip: 10.4.1.12 +# ha-mcastport: 5402 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" + - "lxc:nodes-api=2" + opnfv-promise: + branch: lp:~narindergupta/charms/trusty/promise/trunk + num_units: 1 + to: - "lxc:nodes-api=2" neutron-api-odl: - branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/vpp + branch: lp:~openstack-charmers/charms/trusty/neutron-api-odl/next options: overlay-network-type: 'vxlan gre' - security-groups: true + security-groups: True openvswitch-odl: branch: lp:~openstack-charmers/charms/trusty/openvswitch-odl/trunk relations: @@ -169,6 +244,8 @@ openstack-phase2: - "hacluster-nova:ha" - - "openstack-dashboard:ha" - "hacluster-horizon:ha" + - - "ceilometer:ha" + - "hacluster-ceilometer:ha" - - "neutron-api:neutron-plugin-api-subordinate" - "neutron-api-odl:neutron-plugin-api-subordinate" - - "nova-compute:neutron-plugin" @@ -184,11 +261,11 @@ openstack-phase2: - - "nova-cloud-controller:shared-db" - "percona-cluster:shared-db" - - "nova-cloud-controller:amqp" - - "rabbitmq-server:amqp" + - "rabbitmq-server:amqp" - - "nova-cloud-controller:image-service" - "glance:image-service" - - - "nova-cloud-controller:identity-service" - - "keystone:identity-service" + - - "nova-cloud-controller:identity-service" + - "keystone:identity-service" - - "nova-cloud-controller:cloud-compute" - "nova-compute:cloud-compute" - - "nova-compute:amqp" @@ -197,26 +274,69 @@ openstack-phase2: - "glance:image-service" - - "glance:shared-db" - "percona-cluster:shared-db" - - - "glance:identity-service" - - "keystone:identity-service" + - - "glance:identity-service" + - "keystone:identity-service" - - "glance:amqp" - "rabbitmq-server:amqp" - - "openstack-dashboard:identity-service" - - "keystone:identity-service" + - "keystone:identity-service" - - "neutron-api:shared-db" - "percona-cluster:shared-db" - - - "neutron-api:amqp" - - "rabbitmq-server:amqp" + - - "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" + - - "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" + - - "ceph-osd:mon" + - "ceph:osd" + - - "ceph-radosgw:mon" + - "ceph:radosgw" + - - "ceph-radosgw:identity-service" + - "keystone:identity-service" + trusty-liberty-nodes: inherits: openstack-phase1 overrides: @@ -225,12 +345,16 @@ trusty-liberty-nodes: trusty-liberty: inherits: openstack-phase2 overrides: - cluster_count: 3 +# cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-liberty" "openstack-origin": "cloud:trusty-liberty" series: trusty + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -240,13 +364,16 @@ trusty-kilo-nodes: trusty-kilo: inherits: openstack-phase2 overrides: - cluster_count: 3 +# cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-kilo" "openstack-origin": "cloud:trusty-kilo" series: trusty - + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -256,11 +383,14 @@ trusty-juno-nodes: trusty-juno: inherits: openstack-phase2 overrides: - cluster_count: 3 +# cluster_count: 3 #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical source: "cloud:trusty-juno" "openstack-origin": "cloud:trusty-juno" series: trusty - + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin