openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Switch manila-share to pacemaker version in scenario004/containers"

This commit is contained in:
Jenkins 2017-09-02 06:29:00 +00:00 committed by Gerrit Code Review
parent 26587fcd58 02cd34d148
commit 1a0ef67831
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ci/environments/scenario004-multinode-containers.yaml
View File

@ -16,7 +16,7 @@ resource_registry:
OS::TripleO::Services::SwiftRingBuilder: OS::Heat::None
OS::TripleO::Services::ManilaApi: ../../docker/services/manila-api.yaml
OS::TripleO::Services::ManilaScheduler: ../../docker/services/manila-scheduler.yaml
OS::TripleO::Services::ManilaShare: ../../docker/services/manila-share.yaml
OS::TripleO::Services::ManilaShare: ../../docker/services/pacemaker/manila-share.yaml
OS::TripleO::Services::ManilaBackendCephFs: ../../puppet/services/manila-backend-cephfs.yaml
# NOTE: This is needed because of upgrades from Ocata to Pike. We
# deploy the initial environment with Ocata templates, and