openstack
/
fuel-octane
Code Issues Proposed changes

Use KEYSTONE_* env vars 

Fix bug with wrong environment variables.
Replace OS_PASSWORD and OS_USERNAME to KEYSTONE_PASS and KEYSTONE_USER

Change-Id: I51f8bbd01ffec1befcb30eeeccd6ad3bd85517ae
Closes-bug: 1557563
(cherry picked from commit ec7c2ca2f9)
This commit is contained in:
Oleg Gelbukh 2016-03-20 20:36:16 +03:00
parent 38e20cd5b8
commit 58a8c150ea
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
octane/handlers/backup_restore/__init__.py
View File

@ -55,6 +55,6 @@ class NailgunCredentialsContext(object):
def get_credentials_env(self):
env = os.environ.copy()
env["OS_USERNAME"] = self.user
env["OS_PASSWORD"] = self.password
env["KEYSTONE_USER"] = self.user
env["KEYSTONE_PASS"] = self.password
return env

4
octane/tests/test_archivators_restore.py
View File

@ -149,7 +149,7 @@ def test_path_restore(mocker, cls, path, members):
if cls is ssh.SshArchivator:
subprocess_mock.assert_called_once_with(
["fuel-bootstrap", "build", "--activate"],
env={'OS_PASSWORD': 'password', 'OS_USERNAME': 'user'})
env={'KEYSTONE_PASS': 'password', 'KEYSTONE_USER': 'user'})
else:
assert not subprocess_mock.called
@ -512,7 +512,7 @@ def test_post_restore_nailgun(mocker, mock_open, dump, calls, data_for_update):
assert json_mock.call_count == 3
mock_subprocess_call.assert_called_once_with([
"fuel", "release", "--sync-deployment-tasks", "--dir", "/etc/puppet/"],
env={'OS_PASSWORD': 'password', 'OS_USERNAME': 'admin'}
env={'KEYSTONE_PASS': 'password', 'KEYSTONE_USER': 'admin'}
)
run_in_container_mock.assert_called_with(