openstack
/
python-tripleoclient
Code Issues Proposed changes

Merge "Handle root as a deployment user better" into stable/train

This commit is contained in:
Zuul 2021-03-15 16:15:30 +00:00 committed by Gerrit Code Review
parent bcf4718064 f757716847
commit 7536d5b8e0
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tripleoclient/utils.py
View File

@ -2085,7 +2085,7 @@ def copy_clouds_yaml(user):
:param user: deployment user :param user: deployment user
""" """
clouds_etc_file = '/etc/openstack/clouds.yaml' clouds_etc_file = '/etc/openstack/clouds.yaml'
clouds_home_dir = os.path.join('/home', user) clouds_home_dir = os.path.expanduser("~{}".format(user))
clouds_config_dir = os.path.join(clouds_home_dir, '.config') clouds_config_dir = os.path.join(clouds_home_dir, '.config')
clouds_openstack_config_dir = os.path.join(clouds_config_dir, clouds_openstack_config_dir = os.path.join(clouds_config_dir,
'openstack') 'openstack')

6
tripleoclient/v1/tripleo_deploy.py
View File

@ -1436,6 +1436,12 @@ class Deploy(command.Command):
self.log.debug("take_action(%s)" % parsed_args) self.log.debug("take_action(%s)" % parsed_args)
utils.ansible_symlink() utils.ansible_symlink()
if parsed_args.deployment_user == 'root':
self.log.warning(
_("[WARNING] Deployment user is set to 'root'. This may cause "
"some deployment files to be located in /root. Please use "
"--deployment-user to specify the user you are deploying "
"with."))
try: try:
if parsed_args.standalone: if parsed_args.standalone:
if self._standalone_deploy(parsed_args) != 0: if self._standalone_deploy(parsed_args) != 0: