Code Review
/
joid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
type replaced Memeber with Member. Reducing the OSD to signle
[joid.git]
/
ci
/
opencontrail
/
juju-deployer
/
contrail-ha.yaml
diff --git
a/ci/opencontrail/juju-deployer/contrail-ha.yaml
b/ci/opencontrail/juju-deployer/contrail-ha.yaml
index
3183c61
..
90b85f6
100644
(file)
--- a/
ci/opencontrail/juju-deployer/contrail-ha.yaml
+++ b/
ci/opencontrail/juju-deployer/contrail-ha.yaml
@@
-3,11
+3,11
@@
openstack-phase1:
series: trusty
services:
nodes-api:
series: trusty
services:
nodes-api:
- charm: "
local:trusty/ubuntu-nodes-controller
"
+ charm: "
cs:trusty/ubuntu
"
num_units: 3
constraints: tags=control
nodes-compute:
num_units: 3
constraints: tags=control
nodes-compute:
- charm: "
local:trusty/ubuntu-nodes-compute
"
+ charm: "
cs:trusty/ubuntu
"
num_units: 2
constraints: tags=compute
"ntp":
num_units: 2
constraints: tags=compute
"ntp":
@@
-17,15
+17,15
@@
openstack-phase1:
num_units: 3
series: precise
to:
num_units: 3
series: precise
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
cassandra:
branch: lp:~stub/charms/trusty/cassandra/noauthentication
num_units: 3
to:
cassandra:
branch: lp:~stub/charms/trusty/cassandra/noauthentication
num_units: 3
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
options:
authenticator: AllowAllAuthenticator
- "lxc:nodes-api=2"
options:
authenticator: AllowAllAuthenticator
@@
-38,7
+38,7
@@
openstack-phase2:
inherits: openstack-phase1
services:
"percona-cluster":
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
num_units: 3
options:
"dataset-size": 2G
@@
-48,9
+48,9
@@
openstack-phase2:
"sst-password": 127rc14t51
vip: 10.4.1.15
to:
"sst-password": 127rc14t51
vip: 10.4.1.15
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
"hacluster-keystone":
charm: "cs:trusty/hacluster"
options:
"hacluster-keystone":
charm: "cs:trusty/hacluster"
options:
@@
-87,9
+87,9
@@
openstack-phase2:
options:
vip: 10.4.1.14
to:
options:
vip: 10.4.1.14
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
"ceilometer-agent":
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
"mongodb":
"ceilometer-agent":
branch: "lp:~openstack-charmers/charms/trusty/ceilometer-agent/next"
"mongodb":
@@
-127,13
+127,12
@@
openstack-phase2:
- "nodes-api=2"
ceph-radosgw:
charm: cs:trusty/ceph-radosgw
- "nodes-api=2"
ceph-radosgw:
charm: cs:trusty/ceph-radosgw
- num_units:
3
+ num_units:
1
options:
use-embedded-webserver: true
options:
use-embedded-webserver: true
+ operator-roles: "Member,admin"
to:
- "lxc:nodes-api=0"
to:
- "lxc:nodes-api=0"
- - "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
cinder:
charm: cs:trusty/cinder
cinder:
charm: cs:trusty/cinder
@@
-152,8
+151,8
@@
openstack-phase2:
branch: lp:charms/trusty/rabbitmq-server
num_units: 3
to:
branch: lp:charms/trusty/rabbitmq-server
num_units: 3
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
"keystone":
branch: lp:charms/trusty/keystone
- "lxc:nodes-api=2"
"keystone":
branch: lp:charms/trusty/keystone
@@
-163,9
+162,9
@@
openstack-phase2:
"admin-token": admin
vip: 10.4.1.13
to:
"admin-token": admin
vip: 10.4.1.13
to:
+ - "lxc:nodes-api=2"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- - "lxc:nodes-api=2"
"openstack-dashboard":
branch: lp:charms/trusty/openstack-dashboard
num_units: 3
"openstack-dashboard":
branch: lp:charms/trusty/openstack-dashboard
num_units: 3
@@
-199,8
+198,8
@@
openstack-phase2:
"service-guard": true
vip: 10.4.1.16
to:
"service-guard": true
vip: 10.4.1.16
to:
- - "lxc:nodes-api=0"
- "lxc:nodes-api=1"
- "lxc:nodes-api=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
"neutron-api":
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
- "lxc:nodes-api=2"
"neutron-api":
branch: lp:~openstack-charmers/charms/trusty/neutron-api/next
@@
-210,17
+209,17
@@
openstack-phase2:
manage-neutron-plugin-legacy-mode: False
vip: 10.4.1.17
to:
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=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:
"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=1"
+ - "lxc:nodes-api=0"
- "lxc:nodes-api=2"
relations:
- [ "glance:ha", "hacluster-glance:ha" ]
- "lxc:nodes-api=2"
relations:
- [ "glance:ha", "hacluster-glance:ha" ]
@@
-357,6
+356,8
@@
trusty-liberty:
openstack-origin: cloud:trusty-liberty
source: "cloud:trusty-liberty"
ceph-osd-replication-count: 2
openstack-origin: cloud:trusty-liberty
source: "cloud:trusty-liberty"
ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
trusty-kilo-nodes:
inherits: openstack-phase1
trusty-kilo-nodes:
inherits: openstack-phase1
@@
-375,6
+376,8
@@
trusty-kilo:
openstack-origin: cloud:trusty-kilo
source: "cloud:trusty-kilo"
ceph-osd-replication-count: 2
openstack-origin: cloud:trusty-kilo
source: "cloud:trusty-kilo"
ceph-osd-replication-count: 2
+ admin-role: admin
+ keystone-admin-role: admin
trusty-juno-nodes:
inherits: openstack-phase1
trusty-juno-nodes:
inherits: openstack-phase1
@@
-392,5
+395,6
@@
trusty-juno:
openstack-origin: cloud:trusty-juno
source: "cloud:trusty-juno"
ceph-osd-replication-count: 2
openstack-origin: cloud:trusty-juno
source: "cloud:trusty-juno"
ceph-osd-replication-count: 2
-
+ admin-role: admin
+ keystone-admin-role: admin