Merge "Handle root as a deployment user better" into stable/train
This commit is contained in:
commit
7536d5b8e0
|
@ -2085,7 +2085,7 @@ def copy_clouds_yaml(user):
|
|||
:param user: deployment user
|
||||
"""
|
||||
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_openstack_config_dir = os.path.join(clouds_config_dir,
|
||||
'openstack')
|
||||
|
|
|
@ -1436,6 +1436,12 @@ class Deploy(command.Command):
|
|||
self.log.debug("take_action(%s)" % parsed_args)
|
||||
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:
|
||||
if parsed_args.standalone:
|
||||
if self._standalone_deploy(parsed_args) != 0:
|
||||
|
|
Loading…
Reference in New Issue