starlingx
/
config
Code Issues Proposed changes

Reconfig region on non-DC system 

This commit enables openstack region
reconfiguration from subcloud only
to subcloud and non-DC system

Test Plan:
PASS: DC SystemController Installation and subcloud deployment.
PASS: Standalone Cloud deployment.

Signed-off-by: Yuxing Jiang <Yuxing.Jiang@windriver.com>
Change-Id: I8baebf86a28100daa720112cf9f02511847ca452
This commit is contained in:
Yuxing Jiang 2024-03-25 08:58:24 -04:00 committed by Dipankar Kar
parent cd5f286b14
commit 7e7a81a1ed
1 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sysinv/sysinv/sysinv/sysinv/puppet/keystone.py
View File

@ -83,6 +83,7 @@ class KeystonePuppet(openstack.OpenstackBasePuppet):
admin_project = self.get_admin_project_name()
config = {
'barbican::keystone::authtoken::region_name': self._region_name(),
'keystone::public_bind_host': self._get_management_address(),
'keystone::admin_bind_host': self._get_management_address(),
@ -97,9 +98,27 @@ class KeystonePuppet(openstack.OpenstackBasePuppet):
'keystone::bootstrap::internal_url': self.get_internal_url(),
'keystone::bootstrap::admin_url': self.get_admin_url(),
'keystone::bootstrap::region': self._region_name(),
'keystone::roles::admin::admin': admin_username,
'openstack::keystone::params::api_version': self.SERVICE_PATH,
'openstack::keystone::params::identity_uri':
self.get_identity_uri(),
'openstack::keystone::params::auth_uri':
self.get_auth_uri(),
'openstack::keystone::params::host_url':
self._format_url_address(self._get_management_address()),
# The region in which the identity server can be found
# and it could be different than the region where the
# system resides
'openstack::keystone::params::region_name':
self._identity_specific_region_name(),
'openstack::keystone::params::system_controller_region':
constants.SYSTEM_CONTROLLER_REGION,
'openstack::keystone::params::service_create':
self._to_create_services(),
'platform::mtce::params::auth_region': self._region_name(),
'platform::client::params::admin_username': admin_username,
'platform::client::params::admin_project_name': admin_project,
'platform::client::params::admin_user_domain':
@ -112,22 +131,6 @@ class KeystonePuppet(openstack.OpenstackBasePuppet):
self._identity_specific_region_name(),
'platform::client::params::auth_region':
self._identity_specific_region_name(),
'openstack::keystone::params::api_version': self.SERVICE_PATH,
'openstack::keystone::params::identity_uri':
self.get_identity_uri(),
'openstack::keystone::params::auth_uri':
self.get_auth_uri(),
'openstack::keystone::params::host_url':
self._format_url_address(self._get_management_address()),
# The region in which the identity server can be found
# and it could be different than the region where the
# system resides
'openstack::keystone::params::region_name':
self._identity_specific_region_name(),
'openstack::keystone::params::system_controller_region':
constants.SYSTEM_CONTROLLER_REGION,
'openstack::keystone::params::service_create':
self._to_create_services(),
'CONFIG_KEYSTONE_ADMIN_USERNAME': self.get_admin_user_name(),
}