Merge "Adding "node_name" config variable"

This commit is contained in:
Jenkins 2016-10-05 09:21:24 +00:00 committed by Gerrit Code Review
commit 3ef35acd3e
2 changed files with 7 additions and 1 deletions

View File

@ -335,6 +335,8 @@ def get_variables(role_name):
for k in os.environ:
if k.startswith('CCP_'):
variables[k] = os.environ[k]
if os.environ.get('CCP_NODE_NAME'):
variables['node_name'] = os.environ['CCP_NODE_NAME']
LOG.debug("Getting meta info from %s", META_FILE)
LOG.debug("Creating network topology configuration")
variables["network_topology"] = create_network_topology(meta_info,

View File

@ -74,10 +74,12 @@ class TestGetVariables(base.TestCase):
def setUp(self):
super(TestGetVariables, self).setUp()
os.environ['CCP_VAR_FOO'] = 'CCP_VAL_FOO'
os.environ['CCP_NODE_NAME'] = 'node1'
def tearDown(self):
super(TestGetVariables, self).tearDown()
del os.environ['CCP_VAR_FOO']
del os.environ['CCP_NODE_NAME']
@mock.patch('six.moves.builtins.open', mock.mock_open())
@mock.patch('json.load')
@ -92,7 +94,9 @@ class TestGetVariables(base.TestCase):
'glob': 'glob_val',
'role_name': 'role',
'network_topology': 'network_topology',
'CCP_VAR_FOO': 'CCP_VAL_FOO'
'node_name': 'node1',
'CCP_VAR_FOO': 'CCP_VAL_FOO',
'CCP_NODE_NAME': 'node1'
}
self.assertEqual(r_value, e_value)