From 37fbda6bd89090a15f03ae38372f93373a240cb0 Mon Sep 17 00:00:00 2001 From: Nicolas Pochet Date: Thu, 19 Jul 2018 18:45:26 +0200 Subject: [PATCH] Remove reference to ntp package This is motivated by the fact that: * the ntp/chrony package is already a dependency of the ceph-mon/osd package * NTP will be managed by operators through the NTP charm It is thus useless to keep that package mentioned here. Change-Id: If6ecfc6f515bec4f955a5b52df8f0fbfafd29008 Closes-Bug: #1780690 Depends-on: Iddb7ffcc7ab7a74700855b950f619208511c2fab --- lib/ceph/utils.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/lib/ceph/utils.py b/lib/ceph/utils.py index 7bb951ca..7759ec49 100644 --- a/lib/ceph/utils.py +++ b/lib/ceph/utils.py @@ -40,7 +40,6 @@ from charmhelpers.core.host import ( service_start, service_stop, CompareHostReleases, - is_container, ) from charmhelpers.core.hookenv import ( cached, @@ -81,7 +80,7 @@ LEADER = 'leader' PEON = 'peon' QUORUM = [LEADER, PEON] -PACKAGES = ['ceph', 'gdisk', 'ntp', 'btrfs-tools', 'python-ceph', +PACKAGES = ['ceph', 'gdisk', 'btrfs-tools', 'python-ceph', 'radosgw', 'xfsprogs', 'python-pyudev', 'lvm2', 'parted'] @@ -2615,9 +2614,6 @@ def determine_packages(): :returns: list of ceph packages """ - if is_container(): - PACKAGES.remove('ntp') - return PACKAGES