Sync charms.ceph
use btrfs-progs instead of btrfs-tools for eoan and later update bionic-train zaza test bundle to include placement Closes-Bug: #1850181 Change-Id: Ic8e46dda154c19edadf0e6810701233c3db88e04
This commit is contained in:
parent
86536fb52a
commit
40e1ce044c
@ -80,7 +80,12 @@ LEADER = 'leader'
|
||||
PEON = 'peon'
|
||||
QUORUM = [LEADER, PEON]
|
||||
|
||||
PACKAGES = ['ceph', 'gdisk', 'btrfs-tools',
|
||||
if CompareHostReleases(lsb_release()['DISTRIB_CODENAME']) >= 'eoan':
|
||||
btrfs_package = 'btrfs-progs'
|
||||
else:
|
||||
btrfs_package = 'btrfs-tools'
|
||||
|
||||
PACKAGES = ['ceph', 'gdisk', btrfs_package,
|
||||
'radosgw', 'xfsprogs',
|
||||
'lvm2', 'parted', 'smartmontools']
|
||||
|
||||
|
@ -1,49 +1,49 @@
|
||||
series: bionic
|
||||
applications:
|
||||
ceph-osd:
|
||||
charm: cs:~openstack-charmers-next/ceph-osd
|
||||
charm: ceph-osd
|
||||
num_units: 3
|
||||
series: bionic
|
||||
storage:
|
||||
osd-devices: 'cinder,10G'
|
||||
options:
|
||||
osd-devices: '/dev/test-non-existent'
|
||||
source: cloud:bionic-train/proposed
|
||||
source: cloud:bionic-train
|
||||
ceph-mon:
|
||||
charm: ceph-mon
|
||||
series: bionic
|
||||
charm: cs:~openstack-charmers-next/ceph-mon
|
||||
num_units: 3
|
||||
options:
|
||||
monitor-count: '3'
|
||||
source: cloud:bionic-train/proposed
|
||||
source: cloud:bionic-train
|
||||
percona-cluster:
|
||||
charm: cs:~openstack-charmers-next/percona-cluster
|
||||
num_units: 1
|
||||
options:
|
||||
dataset-size: 25%
|
||||
max-connections: 1000
|
||||
source: cloud:bionic-train/proposed
|
||||
source: cloud:bionic-train
|
||||
rabbitmq-server:
|
||||
charm: cs:~openstack-charmers-next/rabbitmq-server
|
||||
num_units: 1
|
||||
options:
|
||||
source: cloud:bionic-train/proposed
|
||||
source: cloud:bionic-train
|
||||
keystone:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/keystone
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train/proposed
|
||||
openstack-origin: cloud:bionic-train
|
||||
nova-compute:
|
||||
charm: cs:~openstack-charmers-next/nova-compute
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train/proposed
|
||||
openstack-origin: cloud:bionic-train
|
||||
glance:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/glance
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train/proposed
|
||||
openstack-origin: cloud:bionic-train
|
||||
cinder:
|
||||
expose: True
|
||||
charm: cs:~openstack-charmers-next/cinder
|
||||
@ -51,7 +51,7 @@ applications:
|
||||
options:
|
||||
block-device: 'None'
|
||||
glance-api-version: '2'
|
||||
openstack-origin: cloud:bionic-train/proposed
|
||||
openstack-origin: cloud:bionic-train
|
||||
cinder-ceph:
|
||||
charm: cs:~openstack-charmers-next/cinder-ceph
|
||||
nova-cloud-controller:
|
||||
@ -59,7 +59,12 @@ applications:
|
||||
charm: cs:~openstack-charmers-next/nova-cloud-controller
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train/proposed
|
||||
openstack-origin: cloud:bionic-train
|
||||
placement:
|
||||
charm: cs:~openstack-charmers-next/placement
|
||||
num_units: 1
|
||||
options:
|
||||
openstack-origin: cloud:bionic-train
|
||||
relations:
|
||||
- - nova-compute:amqp
|
||||
- rabbitmq-server:amqp
|
||||
@ -101,3 +106,9 @@ relations:
|
||||
- nova-compute:cloud-compute
|
||||
- - nova-cloud-controller:image-service
|
||||
- glance:image-service
|
||||
- - placement
|
||||
- percona-cluster
|
||||
- - placement
|
||||
- keystone
|
||||
- - placement
|
||||
- nova-cloud-controller
|
||||
|
Loading…
Reference in New Issue
Block a user