diff options
Diffstat (limited to 'ci/opencontrail/juju-deployer/contrail-ha.yaml')
| -rw-r--r-- | ci/opencontrail/juju-deployer/contrail-ha.yaml | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/ci/opencontrail/juju-deployer/contrail-ha.yaml b/ci/opencontrail/juju-deployer/contrail-ha.yaml index 6cc86bf6..20545145 100644 --- a/ci/opencontrail/juju-deployer/contrail-ha.yaml +++ b/ci/opencontrail/juju-deployer/contrail-ha.yaml @@ -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 @@ -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": @@ -130,6 +130,7 @@ openstack-phase2: num_units: 1 options: use-embedded-webserver: true + operator-roles: "Memeber,admin" to: - "lxc:nodes-api=0" @@ -150,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 @@ -161,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 @@ -197,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 @@ -208,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" ] @@ -356,7 +357,7 @@ trusty-liberty: source: "cloud:trusty-liberty" ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-kilo-nodes: inherits: openstack-phase1 @@ -376,7 +377,7 @@ trusty-kilo: source: "cloud:trusty-kilo" ceph-osd-replication-count: 2 admin-role: admin - + keystone-admin-role: admin trusty-juno-nodes: inherits: openstack-phase1 @@ -395,6 +396,5 @@ trusty-juno: source: "cloud:trusty-juno" ceph-osd-replication-count: 2 admin-role: admin - - + keystone-admin-role: admin |