Browse Source

Handle root as a deployment user better

Currently if you don't specify --deployment-user and for whatever reason
it's run as root (e.g. ansible as root using sudo), the deployment fails
because it attempts to write out to /home/root/. This change updates the
user home root lookup for clouds.yaml and throws a warning about setting
--deployment-user if it's root.

Conflicts:
	tripleoclient/v1/tripleo_deploy.py

Closes-Bug: #1918560
Change-Id: I284b374cc5e6d6a147286f0485832258f93f038f
(cherry picked from commit ff56863b26)
(cherry picked from commit d57af5e77e)
changes/09/779909/1
Alex Schultz 6 months ago
committed by Takashi Kajinami
parent
commit
f757716847
2 changed files with 7 additions and 1 deletions
  1. +1
    -1
      tripleoclient/utils.py
  2. +6
    -0
      tripleoclient/v1/tripleo_deploy.py

+ 1
- 1
tripleoclient/utils.py View File

@ -2064,7 +2064,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')


+ 6
- 0
tripleoclient/v1/tripleo_deploy.py View File

@ -1422,6 +1422,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…
Cancel
Save