x
/
fuel-ccp-entrypoint
Code Issues Proposed changes

Removing CCP_* env vars 

The only case where we need it was nodeName parameter
from k8s downward api, now we have "node_name" parameter
available for rendering in all containers

Change-Id: If6d76cd69b0d176842fc659a86971e8584992122
This commit is contained in:
Andrey Pavlov 2016-09-29 11:02:45 +03:00
parent 8619ec9bcf
commit ec7007f69c
2 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fuel_ccp_entrypoint/start_script.py
View File

@ -332,9 +332,6 @@ def get_variables(role_name):
meta_info = json.load(f)
variables['role_name'] = role_name
LOG.info("Get CCP environment variables")
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)

6
fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py
View File

@ -73,12 +73,10 @@ 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())
@ -94,9 +92,7 @@ class TestGetVariables(base.TestCase):
'glob': 'glob_val',
'role_name': 'role',
'network_topology': 'network_topology',
'node_name': 'node1',
'CCP_VAR_FOO': 'CCP_VAL_FOO',
'CCP_NODE_NAME': 'node1'
'node_name': 'node1'
}
self.assertEqual(r_value, e_value)