openstack/python-tripleoclient
Code Issues Proposed changes

Merge "Move back to docker-site.yaml for ceph ansible update"

Browse Source
This commit is contained in:
Zuul
2017-11-24 19:27:08 +00:00
committed by Gerrit Code Review
parent 2ae6670274 1020a23ae9
commit f7c0214aee
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
tripleoclient/tests/v1/overcloud_update/test_overcloud_update.py
View File

@@ -65,8 +65,8 @@ class TestOvercloudUpdate(fakes.TestOvercloudUpdate):
self.app.client_manager, self.app.client_manager,
container='mystack', container='mystack',
container_registry={'fake_container': 'fake_value'}, container_registry={'fake_container': 'fake_value'},
ceph_ansible_playbook='/usr/share/ceph-ansible/infrastructure-' ceph_ansible_playbook='/usr/share/ceph-ansible'
'playbooks/rolling_update.yml', '/site-docker.yml.sample',
) )
@mock.patch('tripleoclient.workflows.package_update.update', @mock.patch('tripleoclient.workflows.package_update.update',

4
tripleoclient/v1/overcloud_update.py
View File

@@ -62,8 +62,8 @@ class UpdateOvercloud(command.Command):
) )
parser.add_argument('--ceph-ansible-playbook', parser.add_argument('--ceph-ansible-playbook',
action="store", action="store",
default="/usr/share/ceph-ansible/infrastructure-" default="/usr/share/ceph-ansible"
"playbooks/rolling_update.yml", "/site-docker.yml.sample",
help=_('Path to switch the ceph-ansible playbook ' help=_('Path to switch the ceph-ansible playbook '
'used for update. This value should be set ' 'used for update. This value should be set '
'during the init-minor-update step.') 'during the init-minor-update step.')