Adding "node_name" config variable
"node_name" variable will take the value of CCP_NODE_NAME env variable and will be used during jinja rendering. Support of CCP_* env vars will be removed after migration to "node_name". Change-Id: I8ebbbd94803ccb9a8d13eede2db7db8b13673937 Depends-On: I3e83b4f80737e795446bfd5c7a3941bd5e6ecbf6
This commit is contained in:
parent
5adb1110b7
commit
cbe8887727
|
@ -336,6 +336,8 @@ def get_variables(role_name):
|
||||||
for k in os.environ:
|
for k in os.environ:
|
||||||
if k.startswith('CCP_'):
|
if k.startswith('CCP_'):
|
||||||
variables[k] = os.environ[k]
|
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("Getting meta info from %s", META_FILE)
|
||||||
LOG.debug("Creating network topology configuration")
|
LOG.debug("Creating network topology configuration")
|
||||||
variables["network_topology"] = create_network_topology(meta_info,
|
variables["network_topology"] = create_network_topology(meta_info,
|
||||||
|
|
|
@ -74,10 +74,12 @@ class TestGetVariables(base.TestCase):
|
||||||
def setUp(self):
|
def setUp(self):
|
||||||
super(TestGetVariables, self).setUp()
|
super(TestGetVariables, self).setUp()
|
||||||
os.environ['CCP_VAR_FOO'] = 'CCP_VAL_FOO'
|
os.environ['CCP_VAR_FOO'] = 'CCP_VAL_FOO'
|
||||||
|
os.environ['CCP_NODE_NAME'] = 'node1'
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
super(TestGetVariables, self).tearDown()
|
super(TestGetVariables, self).tearDown()
|
||||||
del os.environ['CCP_VAR_FOO']
|
del os.environ['CCP_VAR_FOO']
|
||||||
|
del os.environ['CCP_NODE_NAME']
|
||||||
|
|
||||||
@mock.patch('six.moves.builtins.open', mock.mock_open())
|
@mock.patch('six.moves.builtins.open', mock.mock_open())
|
||||||
@mock.patch('json.load')
|
@mock.patch('json.load')
|
||||||
|
@ -92,7 +94,9 @@ class TestGetVariables(base.TestCase):
|
||||||
'glob': 'glob_val',
|
'glob': 'glob_val',
|
||||||
'role_name': 'role',
|
'role_name': 'role',
|
||||||
'network_topology': 'network_topology',
|
'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)
|
self.assertEqual(r_value, e_value)
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue