openstack
/
tripleo-common
Code Issues Proposed changes

Merge "Also write NetworkConfig to role dir"

This commit is contained in:
Zuul 2019-07-15 19:03:36 +00:00 committed by Gerrit Code Review
parent 75b2c6370e 8ab13dd58c
commit 217985840b
2 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tripleo_common/tests/utils/test_config.py
View File

@ -823,3 +823,26 @@ class TestConfig(base.TestCase):
mock_get_network_config_data.return_value = dict(Controller='config')
config_dir = '/tmp/tht'
self.config.render_network_config(stack, config_dir, server_roles)
@patch.object(ooo_config.Config, '_open_file')
@patch('tripleo_common.utils.config.Config.get_network_config_data')
def test_render_network_config(self,
mock_get_network_config_data,
mock_open):
heat = mock.MagicMock()
heat.stacks.get.return_value = fakes.create_tht_stack()
config_mock = mock.MagicMock()
config_mock.config = 'some config'
heat.software_configs.get.return_value = config_mock
self.config = ooo_config.Config(heat)
stack = mock.Mock()
server_roles = dict(Controller='controller')
mock_get_network_config_data.return_value = dict(Controller='config')
config_dir = '/tmp/tht'
self.config.render_network_config(stack, config_dir, server_roles)
self.assertEqual(2, mock_open.call_count)
self.assertEqual('/tmp/tht/controller/Controller/NetworkConfig',
mock_open.call_args_list[0][0][0])
self.assertEqual('/tmp/tht/controller/NetworkConfig',
mock_open.call_args_list[1][0][0])

6
tripleo_common/utils/config.py
View File

@ -208,9 +208,13 @@ class Config(object):
self._mkdir(server_deployment_dir)
network_config_path = os.path.join(
server_deployment_dir, "NetworkConfig")
network_config_role_path = os.path.join(
config_dir, server_roles[server], "NetworkConfig")
s_config = self.client.software_configs.get(config)
if getattr(s_config, 'config', ''):
with open(network_config_path, 'w') as f:
with self._open_file(network_config_path) as f:
f.write(s_config.config)
with self._open_file(network_config_role_path) as f:
f.write(s_config.config)
def write_config(self, stack, name, config_dir, config_type=None):