From 67254e334f2263bee8441880550e7fdf4149fe2f Mon Sep 17 00:00:00 2001
From: Andrew McLeod <andrew.mcleod@canonical.com>
Date: Thu, 31 Oct 2019 15:43:56 +0100
Subject: [PATCH] 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               |  7 ++++++-
 tests/bundles/bionic-train.yaml | 11 +++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/lib/ceph/utils.py b/lib/ceph/utils.py
index 6b5e4955..2cdd2f50 100644
--- a/lib/ceph/utils.py
+++ b/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']
 
diff --git a/tests/bundles/bionic-train.yaml b/tests/bundles/bionic-train.yaml
index 2b813ed5..1b270900 100644
--- a/tests/bundles/bionic-train.yaml
+++ b/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