openstack
/
tripleo-common
Code Issues Proposed changes

Persist region name in overcloudrc 

This is useful when deploying a cloud that doesn't use the default
region name.

Change-Id: I21b462f78b32cd334acdf8a5644b70b1f24c8162
Closes-Bug: #1804449
(cherry picked from commit 7cd99c8d13)
This commit is contained in:
Juan Antonio Osorio Robles 2018-11-21 15:06:17 +02:00 committed by Chandan Kumar (raukadah)
parent 8955f037ff
commit 805b292458
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tripleo_common/actions/deployment.py
View File

@ -265,7 +265,9 @@ class OvercloudRcAction(base.TripleOAction):
"environment.")
return actions.Result(error=error)
return overcloudrc.create_overcloudrc(stack, self.no_proxy, admin_pass)
region_name = parameter_defaults.get('KeystoneRegion')
return overcloudrc.create_overcloudrc(stack, self.no_proxy, admin_pass,
region_name)
class DeploymentFailuresAction(base.TripleOAction):

9
tripleo_common/tests/utils/test_overcloudrc.py
View File

@ -34,7 +34,8 @@ class OvercloudRcTest(base.TestCase):
]
}
result = overcloudrc.create_overcloudrc(stack, "", "AdminPassword")
result = overcloudrc.create_overcloudrc(stack, "", "AdminPassword",
"regionTwo")
self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc'])
self.assertIn("OS_PASSWORD=AdminPassword", result['overcloudrc.v3'])
@ -44,3 +45,9 @@ class OvercloudRcTest(base.TestCase):
self.assertIn(overcloudrc.CLOUDPROMPT, result['overcloudrc.v3'])
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc'])
self.assertIn("OS_AUTH_TYPE=password", result['overcloudrc.v3'])
self.assertIn("OS_AUTH_URL=http://foo.com:8000/",
result['overcloudrc'])
self.assertIn("OS_AUTH_URL=http://foo.com:8000/",
result['overcloudrc.v3'])
self.assertIn("OS_REGION_NAME=regionTwo",
result['overcloudrc'])

3
tripleo_common/utils/overcloudrc.py
View File

@ -73,7 +73,7 @@ fi
"""
def create_overcloudrc(stack, no_proxy, admin_password):
def create_overcloudrc(stack, no_proxy, admin_password, region_name):
"""Given the stack and proxy settings, create the overcloudrc
stack: Heat stack containing the deployed overcloud
@ -104,6 +104,7 @@ def create_overcloudrc(stack, no_proxy, admin_password):
'OS_IDENTITY_API_VERSION': '3',
'OS_IMAGE_API_VERSION': constants.DEFAULT_IMAGE_API_VERSION,
'OS_VOLUME_API_VERSION': constants.DEFAULT_VOLUME_API_VERSION,
'OS_REGION_NAME': region_name or 'regionOne'
}
overcloudrc = CLEAR_ENV