From 2cfacc2646dc06d9aa2c9d3667b0a334858a3d30 Mon Sep 17 00:00:00 2001 From: Eric Chen Date: Tue, 7 Sep 2021 05:56:03 +0000 Subject: [PATCH] Remove ntp installation in ceph-fs. For the case in container, it is not necessary to install ntp. For the bare metal, we now expect operators to use a subordinate ntp charm instead. Therefore, we remove ntp installation in ceph-fs. Closes-Bug: #1935013 Change-Id: I48f1a6a1ee6153bbc86cc9acf9302d8eb9d7db43 --- src/lib/charm/openstack/ceph_fs.py | 4 ++-- unit_tests/test_lib_charm_openstack_ceph_fs.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/charm/openstack/ceph_fs.py b/src/lib/charm/openstack/ceph_fs.py index 26e7355..a9433c4 100644 --- a/src/lib/charm/openstack/ceph_fs.py +++ b/src/lib/charm/openstack/ceph_fs.py @@ -164,9 +164,9 @@ class BaseCephFSCharm(charms_openstack.plugins.CephCharm): class MitakaCephFSCharm(BaseCephFSCharm): release = 'mitaka' - packages = ['ceph-mds', 'gdisk', 'ntp', 'btrfs-tools', 'xfsprogs'] + packages = ['ceph-mds', 'gdisk', 'btrfs-tools', 'xfsprogs'] class UssuriCephFSCharm(BaseCephFSCharm): release = 'ussuri' - packages = ['ceph-mds', 'gdisk', 'ntp', 'btrfs-progs', 'xfsprogs'] + packages = ['ceph-mds', 'gdisk', 'btrfs-progs', 'xfsprogs'] diff --git a/unit_tests/test_lib_charm_openstack_ceph_fs.py b/unit_tests/test_lib_charm_openstack_ceph_fs.py index c3964f3..8cf4faf 100644 --- a/unit_tests/test_lib_charm_openstack_ceph_fs.py +++ b/unit_tests/test_lib_charm_openstack_ceph_fs.py @@ -33,7 +33,7 @@ class TestMitakaCephFsCharm(test_utils.PatchHelper): # future versions of this charm, see ``TestCephFsCharm`` for the rest # of the tests self.assertEquals(self.target.packages, [ - 'ceph-mds', 'gdisk', 'ntp', 'btrfs-tools', 'xfsprogs']) + 'ceph-mds', 'gdisk', 'btrfs-tools', 'xfsprogs']) class TestCephFsCharm(test_utils.PatchHelper): @@ -59,7 +59,7 @@ class TestCephFsCharm(test_utils.PatchHelper): self.assertDictEqual(self.target.restart_map, { '/etc/ceph/ceph.conf': ['ceph-mds@somehost']}) self.assertEquals(self.target.packages, [ - 'ceph-mds', 'gdisk', 'ntp', 'btrfs-progs', 'xfsprogs']) + 'ceph-mds', 'gdisk', 'btrfs-progs', 'xfsprogs']) def test_configuration_class(self): self.assertEquals(self.target.options.hostname, 'somehost')