diff --git a/fuel_ccp_entrypoint/start_script.py b/fuel_ccp_entrypoint/start_script.py index 9d9da85..7daf522 100644 --- a/fuel_ccp_entrypoint/start_script.py +++ b/fuel_ccp_entrypoint/start_script.py @@ -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) diff --git a/fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py b/fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py index 81993da..a18185f 100644 --- a/fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py +++ b/fuel_ccp_entrypoint/tests/test_fuel_ccp_entrypoint.py @@ -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)