234a41b7dd
In order to support ephemeral Heat, the external update run command
should rely on the already downloaded config-download playbooks as
generated by update prepare. There is no Heat instance available to
re-download the playbooks automatically.
To support the old behavior with a system installed Heat, a --refresh
option is added which will refresh the config-download playbooks.
We can not have an option to refresh the playbooks automatically with
ephemeral Heat, because the command would need to inherit from
DeployCommand and require environment files so that we can use the
ContainerImagePrepare value to get the ephemeral Heat container images,
as well as the ephemeral Heat setup and tear down code. As this would be
a much larger refactor to the CLI, we avoid it.
The correct fix for the case where the stack may have been modified out
of order is to require another run of update prepare which will
regenerate the playbooks.
Change-Id: Ib01d920112f5e84190fbcd9470dd7bac269b3987
Signed-off-by: James Slagle <jslagle@redhat.com>
(cherry picked from commit 76c9590636)
128 lines
4.8 KiB
Python
128 lines
4.8 KiB
Python
# Copyright 2018 Red Hat, Inc.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
#
|
|
|
|
import fixtures
|
|
import mock
|
|
import os
|
|
|
|
from tripleoclient.tests import fakes as ooofakes
|
|
from tripleoclient.tests.v1.overcloud_external_update import fakes
|
|
from tripleoclient.v1 import overcloud_external_update
|
|
|
|
|
|
class TestOvercloudExternalUpdateRun(fakes.TestOvercloudExternalUpdateRun):
|
|
|
|
def setUp(self):
|
|
super(TestOvercloudExternalUpdateRun, self).setUp()
|
|
|
|
# Get the command object to test
|
|
app_args = mock.Mock()
|
|
app_args.verbose_level = 1
|
|
self.cmd = overcloud_external_update.ExternalUpdateRun(
|
|
self.app, app_args)
|
|
|
|
uuid4_patcher = mock.patch('uuid.uuid4', return_value="UUID4")
|
|
self.mock_uuid4 = uuid4_patcher.start()
|
|
self.addCleanup(self.mock_uuid4.stop)
|
|
|
|
@mock.patch(
|
|
'ansible_runner.runner_config.RunnerConfig',
|
|
autospec=True,
|
|
return_value=ooofakes.FakeRunnerConfig()
|
|
)
|
|
@mock.patch(
|
|
'ansible_runner.Runner.run',
|
|
return_value=ooofakes.fake_ansible_runner_run_return()
|
|
)
|
|
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
|
autospec=True)
|
|
@mock.patch('os.path.expanduser')
|
|
@mock.patch('oslo_concurrency.processutils.execute')
|
|
@mock.patch('six.moves.builtins.open')
|
|
def test_update_with_user_and_tags(self, mock_open, mock_execute,
|
|
mock_expanduser, update_ansible,
|
|
mock_run, mock_run_prepare):
|
|
mock_expanduser.return_value = '/home/fake/'
|
|
argslist = ['--ssh-user', 'tripleo-admin',
|
|
'--tags', 'ceph']
|
|
verifylist = [
|
|
('ssh_user', 'tripleo-admin'),
|
|
('tags', 'ceph'),
|
|
]
|
|
|
|
self.check_parser(self.cmd, argslist, verifylist)
|
|
|
|
@mock.patch(
|
|
'ansible_runner.runner_config.RunnerConfig',
|
|
autospec=True,
|
|
return_value=ooofakes.FakeRunnerConfig()
|
|
)
|
|
@mock.patch(
|
|
'ansible_runner.Runner.run',
|
|
return_value=ooofakes.fake_ansible_runner_run_return()
|
|
)
|
|
@mock.patch('tripleoclient.utils.run_ansible_playbook',
|
|
autospec=True)
|
|
@mock.patch('os.path.expanduser')
|
|
@mock.patch('oslo_concurrency.processutils.execute')
|
|
@mock.patch('six.moves.builtins.open')
|
|
def test_update_with_user_and_extra_vars(self, mock_open, mock_execute,
|
|
mock_expanduser, update_ansible,
|
|
mock_run, mock_run_prepare):
|
|
mock_expanduser.return_value = '/home/fake/'
|
|
argslist = ['--ssh-user', 'tripleo-admin',
|
|
'--extra-vars', 'key1=val1',
|
|
'--extra-vars', 'key2=val2']
|
|
verifylist = [
|
|
('ssh_user', 'tripleo-admin'),
|
|
('extra_vars', ['key1=val1', 'key2=val2'])
|
|
]
|
|
|
|
self.check_parser(self.cmd, argslist, verifylist)
|
|
|
|
@mock.patch('tripleoclient.workflows.deployment.config_download')
|
|
@mock.patch('tripleoclient.utils.get_default_working_dir', autospec=True)
|
|
@mock.patch('tripleoclient.workflows.deployment.snapshot_dir',
|
|
autospec=True)
|
|
@mock.patch('tripleoclient.utils.run_ansible_playbook', autospec=True)
|
|
@mock.patch('tripleoclient.utils.get_key')
|
|
def test_update_with_refresh(
|
|
self, mock_get_key,
|
|
mock_run_ansible_playbook,
|
|
mock_snapshot_dir,
|
|
mock_get_default_working_dir,
|
|
mock_config_download):
|
|
argslist = ['--yes', '--refresh']
|
|
verifylist = [
|
|
('refresh', True)
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
|
|
argslist = ['--yes']
|
|
verifylist = [
|
|
('refresh', False)
|
|
]
|
|
parsed_args = self.check_parser(self.cmd, argslist, verifylist)
|
|
|
|
mock_get_key.return_value = '/test/key'
|
|
work_dir = self.useFixture(fixtures.TempDir())
|
|
mock_get_default_working_dir.return_value = work_dir.path
|
|
ansible_dir = os.path.join(work_dir.path, 'config-download',
|
|
'overcloud')
|
|
self.cmd.take_action(parsed_args)
|
|
mock_get_key.assert_called_once_with('overcloud')
|
|
mock_snapshot_dir.assert_called_once_with(ansible_dir)
|
|
mock_run_ansible_playbook.assert_called()
|
|
mock_config_download.assert_not_called()
|