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: Iddb7ffcc7ab7a74700855b950f619208511c2fab
Closes-Bug: #1780690
This commit is contained in:
Nicolas Pochet 2018-07-20 09:02:49 +02:00
parent 6ee0f95a2b
commit afdd9a974d
2 changed files with 2 additions and 12 deletions

View File

@ -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']
@ -2643,9 +2642,6 @@ def determine_packages():
:returns: list of ceph packages
"""
if is_container():
PACKAGES.remove('ntp')
return PACKAGES

View File

@ -460,16 +460,10 @@ class CephTestCase(unittest.TestCase):
mock_reweight.assert_called_once_with(
['ceph', 'osd', 'crush', 'reweight', 'osd.0', '1'], stderr=-2)
@patch.object(utils, 'is_container')
def test_determine_packages(self, mock_is_container):
mock_is_container.return_value = False
self.assertTrue('ntp' in utils.determine_packages())
def test_determine_packages(self):
self.assertEqual(utils.PACKAGES,
utils.determine_packages())
mock_is_container.return_value = True
self.assertFalse('ntp' in utils.determine_packages())
@patch.object(utils, 'chownr')
@patch.object(utils, 'cmp_pkgrevno')
@patch.object(utils, 'ceph_user')