x
/
fuel-ccp-entrypoint
Code Issues Proposed changes

Adding pod_name jinja variable 

Change-Id: I70e25cd8f83a4e266376cf7a5003e497a2ccb411
Depends-On: I8fc2f026e2f79355c5b80429e3ab7ee854c30639
This commit is contained in:
Andrey Pavlov 2016-12-22 16:52:01 +03:00
parent 5893d2fb44
commit 161346a169
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fuel_ccp_entrypoint/start_script.py
View File

@ -452,10 +452,9 @@ def get_variables(role_name):
meta_info = {}
variables['role_name'] = role_name
LOG.info("Get CCP environment variables")
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['node_name'] = os.environ['CCP_NODE_NAME']
variables['pod_name'] = os.environ['CCP_POD_NAME']
LOG.debug("Creating network topology ")
variables["network_topology"] = create_network_topology(meta_info,
variables)
return variables

5
fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py
View File

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