Updates for stable branch creation

Set default branch for git review/gerrit.

Switch tests to stable.

Switch to using stable charm-helpers branch.

Switch to using stable charm.openstack branch.

Change-Id: I6b94285836ff2e9a677777a44885de0edf4f45d2
This commit is contained in:
Aurelien Lourot 2020-11-02 11:40:03 +01:00
parent 991c2a66cb
commit 7bac47d1be
15 changed files with 146 additions and 144 deletions

View File

@ -2,3 +2,5 @@
host=review.opendev.org
port=29418
project=openstack/charm-ceilometer-agent.git
defaultbranch=stable/20.10

View File

@ -1,4 +1,4 @@
repo: https://github.com/juju/charm-helpers
repo: https://github.com/juju/charm-helpers@stable/20.10
destination: charmhelpers
include:
- core

View File

@ -19,7 +19,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -27,7 +27,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -37,7 +37,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -46,39 +46,39 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
to:
- '6'
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
to:
- '14'

View File

@ -22,7 +22,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -30,7 +30,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -40,7 +40,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -51,7 +51,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -60,42 +60,42 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source

View File

@ -22,7 +22,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -30,7 +30,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -40,7 +40,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -51,7 +51,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -60,42 +60,42 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source

View File

@ -23,7 +23,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -31,7 +31,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -41,7 +41,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -52,7 +52,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -61,49 +61,49 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
constraints: mem=1G
options:

View File

@ -23,7 +23,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -31,7 +31,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -41,7 +41,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -52,7 +52,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -61,49 +61,49 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source
to:
- '14'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
constraints: mem=1G
options:

View File

@ -33,18 +33,18 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -54,7 +54,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -70,7 +70,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@ -82,7 +82,7 @@ applications:
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -92,7 +92,7 @@ applications:
- '10'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -100,7 +100,7 @@ applications:
- '11'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,7 +108,7 @@ applications:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -116,7 +116,7 @@ applications:
- '13'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -124,7 +124,7 @@ applications:
- '14'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
@ -132,7 +132,7 @@ applications:
- '15'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
@ -140,7 +140,7 @@ applications:
- '16'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
constraints: mem=1G
options:

View File

@ -33,18 +33,18 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -54,7 +54,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -70,7 +70,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@ -82,7 +82,7 @@ applications:
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -92,7 +92,7 @@ applications:
- '10'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -100,7 +100,7 @@ applications:
- '11'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,7 +108,7 @@ applications:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -116,7 +116,7 @@ applications:
- '13'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -124,7 +124,7 @@ applications:
- '14'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
@ -132,7 +132,7 @@ applications:
- '15'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
@ -140,7 +140,7 @@ applications:
- '16'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
constraints: mem=1G
options:

View File

@ -33,18 +33,18 @@ machines:
applications:
keystone-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
placement-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
glance-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
nova-cloud-controller-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
gnocchi-mysql-router:
charm: cs:~openstack-charmers-next/mysql-router
charm: cs:~openstack-charmers/mysql-router
mysql-innodb-cluster:
charm: cs:~openstack-charmers-next/mysql-innodb-cluster
charm: cs:~openstack-charmers/mysql-innodb-cluster
num_units: 3
options:
source: *openstack-origin
@ -54,7 +54,7 @@ applications:
- '2'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
options:
source: *openstack-origin
@ -70,7 +70,7 @@ applications:
- '4'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
options:
source: *openstack-origin
@ -82,7 +82,7 @@ applications:
- '7'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *openstack-origin
@ -92,7 +92,7 @@ applications:
- '10'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *openstack-origin
@ -100,7 +100,7 @@ applications:
- '11'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *openstack-origin
@ -108,7 +108,7 @@ applications:
- '12'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *openstack-origin
@ -116,7 +116,7 @@ applications:
- '13'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *openstack-origin
@ -124,7 +124,7 @@ applications:
- '14'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *openstack-origin
@ -132,7 +132,7 @@ applications:
- '15'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *openstack-origin
@ -140,7 +140,7 @@ applications:
- '16'
placement:
charm: cs:~openstack-charmers-next/placement
charm: cs:~openstack-charmers/placement
num_units: 1
constraints: mem=1G
options:

View File

@ -20,7 +20,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -30,35 +30,35 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '4'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '6'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source

View File

@ -12,12 +12,12 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -27,27 +27,27 @@ applications:
to:
- '2'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
to:
- '3'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
to:
- '4'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
to:
- '5'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
to:
- '6'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
to:
- '7'

View File

@ -20,7 +20,7 @@ machines:
15: {}
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -28,7 +28,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -38,7 +38,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -49,7 +49,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -58,42 +58,42 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source

View File

@ -22,7 +22,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -30,7 +30,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -40,7 +40,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -51,7 +51,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -60,42 +60,42 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source

View File

@ -22,7 +22,7 @@ machines:
applications:
percona-cluster:
charm: cs:~openstack-charmers-next/percona-cluster
charm: cs:~openstack-charmers/percona-cluster
num_units: 1
options:
max-connections: 1000
@ -30,7 +30,7 @@ applications:
to:
- '0'
rabbitmq-server:
charm: cs:~openstack-charmers-next/rabbitmq-server
charm: cs:~openstack-charmers/rabbitmq-server
num_units: 1
to:
- '1'
@ -40,7 +40,7 @@ applications:
to:
- '2'
ceph-osd:
charm: cs:~openstack-charmers-next/ceph-osd
charm: cs:~openstack-charmers/ceph-osd
num_units: 3
storage:
osd-devices: 'cinder,10G'
@ -51,7 +51,7 @@ applications:
- '4'
- '5'
ceph-mon:
charm: cs:~openstack-charmers-next/ceph-mon
charm: cs:~openstack-charmers/ceph-mon
num_units: 3
options:
source: *source
@ -60,42 +60,42 @@ applications:
- '7'
- '8'
keystone:
charm: cs:~openstack-charmers-next/keystone
charm: cs:~openstack-charmers/keystone
num_units: 1
options:
openstack-origin: *source
to:
- '9'
glance:
charm: cs:~openstack-charmers-next/glance
charm: cs:~openstack-charmers/glance
num_units: 1
options:
openstack-origin: *source
to:
- '10'
nova-cloud-controller:
charm: cs:~openstack-charmers-next/nova-cloud-controller
charm: cs:~openstack-charmers/nova-cloud-controller
num_units: 1
options:
openstack-origin: *source
to:
- '11'
nova-compute:
charm: cs:~openstack-charmers-next/nova-compute
charm: cs:~openstack-charmers/nova-compute
num_units: 1
options:
openstack-origin: *source
to:
- '12'
ceilometer:
charm: cs:~openstack-charmers-next/ceilometer
charm: cs:~openstack-charmers/ceilometer
num_units: 1
options:
openstack-origin: *source
to:
- '13'
gnocchi:
charm: cs:~openstack-charmers-next/gnocchi
charm: cs:~openstack-charmers/gnocchi
num_units: 1
options:
openstack-origin: *source