Merge "Fix the scenario007 CI job failure"

This commit is contained in:
Zuul 2019-01-03 08:04:23 +00:00 committed by Gerrit Code Review
commit 8ab215a0ad

View File

@ -16,6 +16,13 @@ resource_registry:
# OS::TripleO::Services::Tacker: ../../docker/services/tacker.yaml
OS::TripleO::Services::Tacker: ../../puppet/services/tacker.yaml
OS::TripleO::Services::Congress: ../../docker/services/congress.yaml
# environments/docker-ha.yaml enables the cinder service. So disable cinder services
OS::TripleO::Services::CinderVolume: OS::Heat::None
OS::TripleO::Services::CinderApi: OS::Heat::None
OS::TripleO::Services::CinderScheduler: OS::Heat::None
OS::TripleO::Services::CinderBackup: OS::Heat::None
OS::TripleO::Services::CinderBackendVRTSHyperScale: OS::Heat::None
OS::TripleO::Services::BlockStorageCinderVolume: OS::Heat::None
parameter_defaults:
ControllerServices:
- OS::TripleO::Services::CACerts