diff options
| author |   Zuul <zuul@review.openstack.org> | 2017-11-02 12:37:17 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-11-02 12:37:17 +0000 |
| commit | 674b65acdd03fab70b435098ed46de50828b913d (patch) | |
| tree | baad98117bcf2efad445a37d4e100c2aceccf48e /ci | |
| parent | 34566ec6a091387b85f4a4636f64fa68f903b29d (diff) | |
| parent | 6a7c88faba6462ff1d8ea50cff546c810fa1f4a3 (diff) | |
Merge "Disable MongoDB in scenario002" into stable/pike
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/environments/scenario002-multinode-containers.yaml | 4 | ||||
| -rw-r--r-- | ci/environments/scenario002-multinode.yaml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/ci/environments/scenario002-multinode-containers.yaml b/ci/environments/scenario002-multinode-containers.yaml index bec5f48e..534f8294 100644 --- a/ci/environments/scenario002-multinode-containers.yaml +++ b/ci/environments/scenario002-multinode-containers.yaml @@ -9,7 +9,6 @@ resource_registry: OS::TripleO::Services::BarbicanApi: ../../docker/services/barbican-api.yaml OS::TripleO::Services::Zaqar: ../../docker/services/zaqar.yaml OS::TripleO::Services::Ec2Api: ../../docker/services/ec2-api.yaml - OS::TripleO::Services::MongoDb: ../../docker/services/database/mongodb.yaml # Some infra instances don't pass the ping test but are otherwise working. # Since the OVB jobs also test this functionality we can shut it off here. OS::TripleO::AllNodes::Validation: ../common/all-nodes-validation-disabled.yaml @@ -58,7 +57,6 @@ parameter_defaults: - OS::TripleO::Services::SwiftStorage - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::MongoDb - OS::TripleO::Services::Zaqar - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::TripleoPackages @@ -69,5 +67,7 @@ parameter_defaults: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu Debug: true + ZaqarMessageStore: 'swift' + ZaqarManagementStore: 'sqlalchemy' SwiftCeilometerPipelineEnabled: false NotificationDriver: 'noop' diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index 6c7f4ebb..2f731ce9 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -9,7 +9,6 @@ resource_registry: OS::TripleO::Services::HAproxy: ../../puppet/services/pacemaker/haproxy.yaml OS::TripleO::Services::Pacemaker: ../../puppet/services/pacemaker.yaml OS::TripleO::Services::MySQL: ../../puppet/services/pacemaker/database/mysql.yaml - OS::TripleO::Services::MongoDb: ../../puppet/services/database/mongodb.yaml OS::TripleO::Services::CinderBackup: ../../puppet/services/pacemaker/cinder-backup.yaml OS::TripleO::Services::CinderVolume: ../../puppet/services/pacemaker/cinder-volume.yaml OS::TripleO::Services::Keepalived: OS::Heat::None @@ -63,7 +62,6 @@ parameter_defaults: - OS::TripleO::Services::SwiftStorage - OS::TripleO::Services::SwiftRingBuilder - OS::TripleO::Services::BarbicanApi - - OS::TripleO::Services::MongoDb - OS::TripleO::Services::Zaqar - OS::TripleO::Services::Ec2Api - OS::TripleO::Services::TripleoPackages @@ -86,5 +84,7 @@ parameter_defaults: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu Debug: true + ZaqarMessageStore: 'swift' + ZaqarManagementStore: 'sqlalchemy' SwiftCeilometerPipelineEnabled: false NotificationDriver: 'noop' |