openstack
/
charm-ceph-fs
Code Issues Proposed changes

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
This commit is contained in:
Eric Chen 2021-09-07 05:56:03 +00:00
parent 2f234a8911
commit 2cfacc2646
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/charm/openstack/ceph_fs.py
View File

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

4
unit_tests/test_lib_charm_openstack_ceph_fs.py
View File

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