Merge "Handle root as a deployment user better" into stable/ussuri
This commit is contained in:
commit
7696e266a3
|
@ -2310,7 +2310,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')
|
||||||
|
|
|
@ -1410,6 +1410,12 @@ class Deploy(command.Command):
|
||||||
|
|
||||||
def take_action(self, parsed_args):
|
def take_action(self, parsed_args):
|
||||||
self.log.debug("take_action(%s)" % parsed_args)
|
self.log.debug("take_action(%s)" % parsed_args)
|
||||||
|
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:
|
||||||
self._standalone_deploy(parsed_args)
|
self._standalone_deploy(parsed_args)
|
||||||
|
|
Loading…
Reference in New Issue