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: I6c414cb7db45f5a1a2cf9b65f6fd93c40f631a46

lib/ceph/utils.py

@@ -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']
 

tests/bundles/bionic-train.yaml

@@ -60,6 +60,11 @@ applications:
     num_units: 1
     options:
       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