X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fopencontrail%2Fjuju-deployer%2Fcontrail-ha.yaml;h=90b85f68984ce2733452963b1f59a3bf5f533ae9;hb=961571ebcfb6e1102fd16949578f7ebecc77756d;hp=c6ce1bf85abe303058152bd3f69fe1a4322ec0a0;hpb=557767d49de1dde707fb35a2ae803eba9a01b7ce;p=joid.git diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index c6ce1bf8..90b85f68 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-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" @@ -17,15 +17,15 @@ openstack-phase1: num_units: 3 series: precise to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" cassandra: branch: lp:~stub/charms/trusty/cassandra/noauthentication num_units: 3 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" options: authenticator: AllowAllAuthenticator @@ -38,7 +38,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 @@ -48,9 +48,9 @@ openstack-phase2: "sst-password": 127rc14t51 vip: 10.4.1.15 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "hacluster-keystone": charm: "cs:trusty/hacluster" options: @@ -87,9 +87,9 @@ openstack-phase2: options: vip: 10.4.1.14 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "ceilometer-agent": branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next" "mongodb": @@ -103,33 +103,37 @@ openstack-phase2: - "lxc:nodes-api=0" ceph: charm: cs:trusty/ceph - num_units: 1 + num_units: 2 options: fsid: 5a791d94-980b-11e4-b6f6-3c970e8b1cf7 monitor-secret: AQAi5a9UeJXUExAA+By9u+GPhl8/XiUQ4nwI3A== osd-devices: /srv monitor-count: 1 -# osd-reformat: 'yes' + osd-reformat: 'no' # 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" + - "nodes-compute=1" + 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: 1 + options: + use-embedded-webserver: true + operator-roles: "Member,admin" + to: + - "lxc:nodes-api=0" + cinder: charm: cs:trusty/cinder num_units: 3 @@ -147,8 +151,8 @@ openstack-phase2: branch: lp:charms/trusty/rabbitmq-server num_units: 3 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "keystone": branch: lp:charms/trusty/keystone @@ -158,9 +162,9 @@ openstack-phase2: "admin-token": admin vip: 10.4.1.13 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "openstack-dashboard": branch: lp:charms/trusty/openstack-dashboard num_units: 3 @@ -174,13 +178,13 @@ openstack-phase2: - "lxc:nodes-api=2" "nova-compute": branch: lp:~openstack-charmers/charms/trusty/nova-compute/next - num_units: 1 + num_units: 2 options: "enable-live-migration": False "manage-neutron-plugin-legacy-mode": False to: - "nodes-compute=0" -# - "nodes-compute=1" + - "nodes-compute=1" # - "nodes-api=0" # - "nodes-api=1" # - "nodes-api=2" @@ -194,8 +198,8 @@ openstack-phase2: "service-guard": true vip: 10.4.1.16 to: - - "lxc:nodes-api=0" - "lxc:nodes-api=1" + - "lxc:nodes-api=0" - "lxc:nodes-api=2" "neutron-api": branch: lp:~openstack-charmers/charms/trusty/neutron-api/next @@ -205,17 +209,17 @@ openstack-phase2: manage-neutron-plugin-legacy-mode: False vip: 10.4.1.17 to: + - "lxc:nodes-api=2" - "lxc:nodes-api=0" - "lxc:nodes-api=1" - - "lxc:nodes-api=2" "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=0" - "lxc:nodes-api=2" relations: - [ "glance:ha", "hacluster-glance:ha" ] @@ -259,6 +263,10 @@ openstack-phase2: - [ "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" ] + contrail: inherits: openstack-phase2 services: @@ -343,10 +351,13 @@ trusty-liberty: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-liberty source: "cloud:trusty-liberty" - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -360,10 +371,13 @@ trusty-kilo: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-kilo source: "cloud:trusty-kilo" - ceph-osd-replication-count: 1 + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -376,9 +390,11 @@ trusty-juno: overrides: series: trusty #os-data-network: 10.4.8.0/21 + #prefer-ipv6: true region: Canonical openstack-origin: cloud:trusty-juno source: "cloud:trusty-juno" - ceph-osd-replication-count: 1 - + ceph-osd-replication-count: 2 + admin-role: admin + keystone-admin-role: admin