diff --git a/tripleoclient/constants.py b/tripleoclient/constants.py index 009c88885..104620b12 100644 --- a/tripleoclient/constants.py +++ b/tripleoclient/constants.py @@ -253,6 +253,7 @@ EXPORT_DATA = { # Package that need to be to the latest before undercloud # update/update UNDERCLOUD_EXTRA_PACKAGES = [ + "python3-tripleoclient", "openstack-tripleo-common", "openstack-tripleo-heat-templates", "openstack-tripleo-validations", diff --git a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py index 3ab889f7f..b9803707c 100644 --- a/tripleoclient/tests/v1/undercloud/test_install_upgrade.py +++ b/tripleoclient/tests/v1/undercloud/test_install_upgrade.py @@ -17,7 +17,6 @@ import fixtures import json import mock import os -import sys from jinja2 import Template @@ -539,7 +538,6 @@ class TestUndercloudUpgrade(TestPluginV1): @mock.patch('tripleoclient.utils.prompt_user_for_confirmation', return_value=True) - @mock.patch.object(sys, 'executable', 'python2') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.geteuid', return_value=1001) @mock.patch('getpass.getuser', return_value='stack') @@ -560,7 +558,7 @@ class TestUndercloudUpgrade(TestPluginV1): self.cmd.take_action(parsed_args) mock_run_command.assert_called_with( ['sudo', 'dnf', 'upgrade', '-y', - 'python2-tripleoclient', + 'python3-tripleoclient', 'openstack-tripleo-common', 'openstack-tripleo-heat-templates', 'openstack-tripleo-validations', @@ -609,7 +607,6 @@ class TestUndercloudUpgrade(TestPluginV1): '/usr/share/openstack-tripleo-heat-templates/' 'undercloud-stack-vstate-dropin.yaml']) - @mock.patch.object(sys, 'executable', 'python3') # TODO(cjeanner) drop once we have proper oslo.privsep @mock.patch('os.geteuid', return_value=1001) @mock.patch('getpass.getuser', return_value='stack') diff --git a/tripleoclient/v1/undercloud.py b/tripleoclient/v1/undercloud.py index 20cea996c..63ee5d030 100644 --- a/tripleoclient/v1/undercloud.py +++ b/tripleoclient/v1/undercloud.py @@ -19,7 +19,6 @@ import argparse import logging import os import subprocess -import sys from openstackclient.i18n import _ @@ -245,15 +244,8 @@ class UpgradeUndercloud(InstallUndercloud): utils.ensure_run_as_normal_user() if not parsed_args.skip_package_updates: - if ('python3' in sys.executable): - pyver = '3' - else: - pyver = '2' - client_pkgs = [ - "python{}-tripleoclient".format(pyver), - ] - pkgs = client_pkgs + constants.UNDERCLOUD_EXTRA_PACKAGES - self._update_extra_packages(pkgs, parsed_args.dry_run) + self._update_extra_packages(constants.UNDERCLOUD_EXTRA_PACKAGES, + parsed_args.dry_run) if not parsed_args.dry_run: self._run_upgrade(parsed_args)