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

This commit is contained in:
Zuul 2017-11-24 19:27:08 +00:00 committed by Gerrit Code Review
commit f7c0214aee
2 changed files with 4 additions and 4 deletions

View File

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

View File

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