diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-22 14:06:55 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-22 14:06:55 +0000 |
| commit | e2be921333fc513ac8c0fa7169a4ffa11311ffa8 (patch) | |
| tree | efcf6bef861903af444301c8eaa68255dbc1d676 /ci | |
| parent | d291083e7f990362a5bb4b3b2b22a006d8bc16c1 (diff) | |
| parent | 1a9c2022cd865dfb4d14dde6ceb51de8a090dec2 (diff) | |
Merge "Decouple swift-proxy from ceilometer"
Diffstat (limited to 'ci')
| -rw-r--r-- | ci/environments/scenario002-multinode.yaml | 1 | ||||
| -rw-r--r-- | ci/environments/scenario003-multinode.yaml | 1 | ||||
| -rw-r--r-- | ci/environments/scenario004-multinode.yaml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/ci/environments/scenario002-multinode.yaml b/ci/environments/scenario002-multinode.yaml index 97fec24c..7875ef4e 100644 --- a/ci/environments/scenario002-multinode.yaml +++ b/ci/environments/scenario002-multinode.yaml @@ -49,3 +49,4 @@ parameter_defaults: nova::compute::libvirt::services::libvirt_virt_type: qemu nova::compute::libvirt::libvirt_virt_type: qemu Debug: true + SwiftCeilometerPipelineEnabled: false diff --git a/ci/environments/scenario003-multinode.yaml b/ci/environments/scenario003-multinode.yaml index 092426cb..26f94d03 100644 --- a/ci/environments/scenario003-multinode.yaml +++ b/ci/environments/scenario003-multinode.yaml @@ -50,3 +50,4 @@ parameter_defaults: # we don't deploy Swift so we switch to file backend. GlanceBackend: 'file' KeystoneTokenProvider: 'fernet' + SwiftCeilometerPipelineEnabled: false diff --git a/ci/environments/scenario004-multinode.yaml b/ci/environments/scenario004-multinode.yaml index 4aa18709..0d94cea0 100644 --- a/ci/environments/scenario004-multinode.yaml +++ b/ci/environments/scenario004-multinode.yaml @@ -60,3 +60,4 @@ parameter_defaults: CephMonKey: 'AQC+Ox1VmEr3BxAALZejqeHj50Nj6wJDvs96OQ==' CephAdminKey: 'AQDLOh1VgEp6FRAAFzT7Zw+Y9V6JJExQAsRnRQ==' CephClientKey: 'AQC+vYNXgDAgAhAAc8UoYt+OTz5uhV7ItLdwUw==' + SwiftCeilometerPipelineEnabled: false |