Merge "Implement cloud-config ntp plugin"
This commit is contained in:
commit
630345dd38
@ -28,6 +28,8 @@ PLUGINS = {
|
|||||||
'cloudconfigplugins.set_hostname.SetHostnamePlugin',
|
'cloudconfigplugins.set_hostname.SetHostnamePlugin',
|
||||||
'hostname': 'cloudbaseinit.plugins.common.userdataplugins.'
|
'hostname': 'cloudbaseinit.plugins.common.userdataplugins.'
|
||||||
'cloudconfigplugins.set_hostname.SetHostnamePlugin',
|
'cloudconfigplugins.set_hostname.SetHostnamePlugin',
|
||||||
|
'ntp': 'cloudbaseinit.plugins.common.userdataplugins.'
|
||||||
|
'cloudconfigplugins.set_ntp.SetNtpPlugin',
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -0,0 +1,47 @@
|
|||||||
|
# Copyright 2019 Cloudbase Solutions Srl
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
from oslo_log import log as oslo_logging
|
||||||
|
|
||||||
|
from cloudbaseinit.osutils import factory
|
||||||
|
from cloudbaseinit.plugins.common.userdataplugins.cloudconfigplugins import (
|
||||||
|
base
|
||||||
|
)
|
||||||
|
|
||||||
|
LOG = oslo_logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
class SetNtpPlugin(base.BaseCloudConfigPlugin):
|
||||||
|
"""Change the NTP servers according to the cloud-config userdata.
|
||||||
|
|
||||||
|
Following keys can be present:
|
||||||
|
|
||||||
|
enabled: Whether to enable the NTP changes. Defaults to True.
|
||||||
|
servers: A list of NTP servers. Defaults to empty list.
|
||||||
|
pools: A list of NTP pool servers. Defaults to empty list.
|
||||||
|
|
||||||
|
Pools and servers lists are concatenated and applied to the NTP config.
|
||||||
|
"""
|
||||||
|
|
||||||
|
def process(self, data):
|
||||||
|
ntp_servers = []
|
||||||
|
ntp_servers.extend(data.get('servers', []))
|
||||||
|
ntp_servers.extend(data.get('pools', []))
|
||||||
|
|
||||||
|
if data.get('enabled', True) and ntp_servers:
|
||||||
|
LOG.info("Changing NTP servers to %s." % ntp_servers)
|
||||||
|
osutils = factory.get_os_utils()
|
||||||
|
osutils.set_ntp_client_config(ntp_servers)
|
||||||
|
|
||||||
|
return False
|
@ -0,0 +1,49 @@
|
|||||||
|
# Copyright 2019 Cloudbase Solutions Srl
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
import unittest
|
||||||
|
|
||||||
|
try:
|
||||||
|
import unittest.mock as mock
|
||||||
|
except ImportError:
|
||||||
|
import mock
|
||||||
|
|
||||||
|
from oslo_config import cfg
|
||||||
|
|
||||||
|
from cloudbaseinit.plugins.common.userdataplugins.cloudconfigplugins import (
|
||||||
|
set_ntp
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
CONF = cfg.CONF
|
||||||
|
|
||||||
|
|
||||||
|
class SetNtpPluginTest(unittest.TestCase):
|
||||||
|
|
||||||
|
def setUp(self):
|
||||||
|
self._set_ntp = set_ntp.SetNtpPlugin()
|
||||||
|
|
||||||
|
@mock.patch('cloudbaseinit.osutils.factory.get_os_utils')
|
||||||
|
def _test_process(self, mock_data, mock_get_os_utils):
|
||||||
|
mock_os_util = mock.MagicMock()
|
||||||
|
mock_os_util.set_ntp_client_config.return_value = True
|
||||||
|
mock_get_os_utils.return_value = mock_os_util
|
||||||
|
result_process = self._set_ntp.process(mock_data)
|
||||||
|
self.assertFalse(result_process)
|
||||||
|
|
||||||
|
def test_process_no_servers(self):
|
||||||
|
self._test_process({})
|
||||||
|
|
||||||
|
def test_process_servers_pools(self):
|
||||||
|
self._test_process({'servers': ['one', 'two'], 'pools': 'one'})
|
Loading…
Reference in New Issue
Block a user