openstack
/
python-tripleoclient
Code Issues Proposed changes

Add version to python execution 

We invoke python to parse the templates in the tripleo deployment
command so we need to make sure that runs as either python2 or python3
since the python command may not be available.

Change-Id: I242fdd717d9e52de0b122d50cf7d6a9ad7f0e041
Related-Blueprint: python3-support
This commit is contained in:
Alex Schultz 2018-11-20 17:08:40 -07:00
parent 09c8b52a40
commit eb31beb7f7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tripleoclient/v1/tripleo_deploy.py
View File

@ -104,6 +104,7 @@ class Deploy(command.Command):
ansible_dir = None
python_version = sys.version_info[0]
ansible_playbook_cmd = "ansible-playbook-{}".format(python_version)
python_cmd = "python{}".format(python_version)
def _is_undercloud_deploy(self, parsed_args):
return parsed_args.standalone_role == 'Undercloud' and \
@ -610,7 +611,7 @@ class Deploy(command.Command):
"file %s") % self._get_roles_file_path(parsed_args))
process_templates = os.path.join(parsed_args.templates,
'tools/process-templates.py')
args = ['python', process_templates, '--roles-data',
args = [self.python_cmd, process_templates, '--roles-data',
self._get_roles_file_path(parsed_args), '--output-dir',
self.tht_render]
if utils.run_command_and_log(self.log, args, cwd=self.tht_render) != 0: