openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Explicitly unset package update hooks when re-deploying"

Browse Source
This commit is contained in:
Jenkins 2015-10-16 07:49:19 +00:00 committed by Gerrit Code Review
commit 199a35f696
2 changed files with 12 additions and 3 deletions
tripleoclient
tests/v1/overcloud_deploy
test_overcloud_deploy.py
v1
overcloud_deploy.py

12
tripleoclient/tests/v1/overcloud_deploy/test_overcloud_deploy.py

@ -51,6 +51,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
super(TestDeployOvercloud, self).tearDown()
os.unlink(self.parameter_defaults_env_file)
@mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
'_create_parameters_env')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
@ -91,7 +92,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_generate_overcloud_passwords,
mock_create_tempest_deployer_input,
mock_deploy_postconfig,
mock_create_parameters_env):
mock_create_parameters_env,
mock_breakpoints_cleanup):
arglist = ['--templates', '--ceph-storage-scale', '3']
verifylist = [
@ -198,6 +200,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_process_multiple_env.assert_called_with(
[self.parameter_defaults_env_file])
@mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
'_validate_args')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
@ -240,7 +243,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_generate_overcloud_passwords,
mock_create_tempest_deployer_input,
mock_deploy_postconfig,
mock_create_parameters_env, mock_validate_args):
mock_create_parameters_env, mock_validate_args,
mock_breakpoints_cleanup):
arglist = ['--templates', '--ceph-storage-scale', '3']
verifylist = [
@ -364,6 +368,7 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_validate_args.assert_called_once_with(parsed_args)
@mock.patch('tripleo_common.update.add_breakpoints_cleanup_into_env')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
'_deploy_postconfig')
@mock.patch('tripleoclient.v1.overcloud_deploy.DeployOvercloud.'
@ -400,7 +405,8 @@ class TestDeployOvercloud(fakes.TestDeployOvercloud):
mock_create_overcloudrc,
mock_generate_overcloud_passwords,
mock_create_tempest_deployer_input,
mock_deploy_postconfig):
mock_deploy_postconfig,
mock_breakpoints_cleanup):
arglist = ['--templates', '/home/stack/tripleo-heat-templates']
verifylist = [

3
tripleoclient/v1/overcloud_deploy.py

@ -34,6 +34,7 @@ from os_cloud_config import keystone
from os_cloud_config import keystone_pki
from os_cloud_config.utils import clients
from six.moves import configparser
from tripleo_common import update
from tripleoclient import exceptions
from tripleoclient import utils
@ -267,6 +268,8 @@ class DeployOvercloud(command.Command):
env_files, env = (
template_utils.process_multiple_environments_and_files(
environments))
if stack:
update.add_breakpoints_cleanup_into_env(env)
self.log.debug("Getting template contents")
template_files, template = template_utils.get_template_contents(