openstack
/
instack-undercloud
Code Issues Proposed changes

Merge "remove workaround for tuskar* packages"

This commit is contained in:
Zuul 2018-03-18 00:17:49 +00:00 committed by Gerrit Code Review
parent 79601c6c3e db01d14ef9
commit d500072bfa
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
instack_undercloud/tests/test_undercloud.py
View File

@ -76,10 +76,8 @@ class TestUndercloud(BaseTestCase):
@mock.patch('instack_undercloud.undercloud._run_instack')
@mock.patch('instack_undercloud.undercloud._generate_environment')
@mock.patch('instack_undercloud.undercloud._load_config')
@mock.patch('instack_undercloud.undercloud._die_tuskar_die')
@mock.patch('instack_undercloud.undercloud._run_validation_groups')
def test_install(self, mock_run_validation_groups,
mock_die_tuskar_die, mock_load_config,
def test_install(self, mock_run_validation_groups, mock_load_config,
mock_generate_environment, mock_run_instack,
mock_run_clean_all, mock_run_yum_update, mock_run_orc,
mock_post_config, mock_run_command,
@ -95,7 +93,6 @@ class TestUndercloud(BaseTestCase):
mock_run_command.assert_called_with(
['sudo', 'rm', '-f', '/tmp/svc-map-services'], None, 'rm')
mock_upgrade_fact.assert_called_with(False)
mock_die_tuskar_die.assert_not_called()
mock_run_validation_groups.assert_not_called()
@mock.patch(
@ -111,15 +108,19 @@ class TestUndercloud(BaseTestCase):
@mock.patch('instack_undercloud.undercloud._run_instack')
@mock.patch('instack_undercloud.undercloud._generate_environment')
@mock.patch('instack_undercloud.undercloud._load_config')
@mock.patch('instack_undercloud.undercloud._die_tuskar_die')
@mock.patch('instack_undercloud.undercloud._run_validation_groups')
def test_install_upgrade(self, mock_run_validation_groups,
mock_die_tuskar_die, mock_load_config,
mock_generate_environment, mock_run_instack,
mock_run_yum_clean_all, mock_run_yum_update,
mock_run_orc, mock_post_config, mock_run_command,
mock_load_config,
mock_generate_environment,
mock_run_instack,
mock_run_yum_clean_all,
mock_run_yum_update,
mock_run_orc,
mock_post_config,
mock_run_command,
mock_validate_configuration,
mock_configure_logging, mock_upgrade_fact,
mock_configure_logging,
mock_upgrade_fact,
mock_load_subnets_config_groups):
fake_env = mock.MagicMock()
mock_generate_environment.return_value = fake_env
@ -131,7 +132,6 @@ class TestUndercloud(BaseTestCase):
mock_run_command.assert_called_with(
['sudo', 'rm', '-f', '/tmp/svc-map-services'], None, 'rm')
mock_upgrade_fact.assert_called_with(True)
mock_die_tuskar_die.assert_called_once()
mock_run_validation_groups.assert_called_once()
@mock.patch(
@ -147,10 +147,9 @@ class TestUndercloud(BaseTestCase):
@mock.patch('instack_undercloud.undercloud._run_instack')
@mock.patch('instack_undercloud.undercloud._generate_environment')
@mock.patch('instack_undercloud.undercloud._load_config')
@mock.patch('instack_undercloud.undercloud._die_tuskar_die')
@mock.patch('instack_undercloud.undercloud._run_validation_groups')
def test_install_upgrade_hieradata(self, mock_run_validation_groups,
mock_die_tuskar_die, mock_load_config,
mock_load_config,
mock_generate_environment,
mock_run_instack,
mock_run_yum_clean_all,
@ -178,7 +177,6 @@ class TestUndercloud(BaseTestCase):
'/etc/puppet/hieradata/override.yaml']),
mock_run_command.mock_calls)
mock_upgrade_fact.assert_called_with(True)
mock_die_tuskar_die.assert_called_once()
mock_run_validation_groups.assert_called_once()
@mock.patch('instack_undercloud.undercloud._configure_logging')

14
instack_undercloud/undercloud.py
View File

@ -2253,18 +2253,6 @@ def _handle_upgrade_fact(upgrade=False):
_run_command(['sudo', 'chmod', '0644', fact_path])
def _die_tuskar_die():
"""Remove tuskar* packages
Make sure to remove tuskar https://bugs.launchpad.net/tripleo/+bug/1691744
# openstack-[tuskar, tuskar-ui, tuskar-ui-extras] & python-tuskarclient
"""
try:
_run_command(['sudo', 'yum', 'remove', '-y', '*tuskar*'])
except subprocess.CalledProcessError as e:
LOG.error('Error with tuskar removal task %s - continuing', e.output)
def install(instack_root, upgrade=False):
"""Install the undercloud
@ -2283,8 +2271,6 @@ def install(instack_root, upgrade=False):
instack_env = _generate_environment(instack_root)
_generate_init_data(instack_env)
ovs_interfaces = _get_ovs_interfaces()
if upgrade:
_die_tuskar_die()
if CONF.undercloud_update_packages:
_run_yum_clean_all(instack_env)
if ovs_interfaces: