diff options
| author | gord chung <gord@live.ca> | 2017-10-30 16:37:25 +0000 |
|---|---|---|
| committer | gordon chung <gord@live.ca> | 2017-11-01 19:06:46 +0000 |
| commit | 6de5366a54dee44552407b972ef1d1809321ff42 (patch) | |
| tree | 70e95eb70284a1c0ec6a570457ca64d867aa7029 | |
| parent | c610a74ab0d52ba8b4a5b05492eacbdca06cabbd (diff) | |
| download | ceilometer-6de5366a54dee44552407b972ef1d1809321ff42.tar.gz | |
set ceilometer_backend
- it's gone from devstack-gate.
- disable grenade since stable/newton doesn't exist anymore
Change-Id: Ia93f7cd859b906d7a3e581af3fec689b24f7a5bc
5 files changed, 8 insertions, 10 deletions
@@ -94,10 +94,6 @@ - ceilometer-tox-py27-mongodb - ceilometer-tox-py27-mysql - ceilometer-tox-py27-postgresql - - grenade-dsvm-ceilometer: - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^setup.cfg$ - telemetry-dsvm-integration-ceilometer - ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only gate: @@ -107,9 +103,5 @@ - ceilometer-tox-py27-mongodb - ceilometer-tox-py27-mysql - ceilometer-tox-py27-postgresql - - grenade-dsvm-ceilometer: - irrelevant-files: - - ^(test-|)requirements.txt$ - - ^setup.cfg$ - telemetry-dsvm-integration-ceilometer - ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only diff --git a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml index 36f31640..bb901535 100644 --- a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml +++ b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb-identity-v3-only/run.yaml @@ -32,8 +32,9 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_REGEX="^ceilometer\." export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_CEILOMETER_BACKEND=mongodb export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mongodb" + export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE diff --git a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml index 3d0030ee..744249c2 100644 --- a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml +++ b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mongodb/run.yaml @@ -32,8 +32,9 @@ export DEVSTACK_GATE_TEMPEST=1 export DEVSTACK_GATE_TEMPEST_REGEX="^ceilometer\." export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 - export DEVSTACK_GATE_CEILOMETER_BACKEND=mongodb export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mongodb" + export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE diff --git a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml index 9433c9a7..89983a0c 100644 --- a/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml +++ b/playbooks/legacy/ceilometer-dsvm-tempest-plugin-mysql/run.yaml @@ -34,6 +34,8 @@ export DEVSTACK_GATE_TEMPEST_ALL_PLUGINS=1 export DEVSTACK_GATE_CEILOMETER_BACKEND=mysql export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mysql" + export BRANCH_OVERRIDE=default if [ "$BRANCH_OVERRIDE" != "default" ] ; then export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE diff --git a/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml b/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml index e513564c..71b80a20 100644 --- a/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ceilometer/run.yaml @@ -36,6 +36,8 @@ export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE fi export GRENADE_PLUGINRC="enable_grenade_plugin ceilometer https://git.openstack.org/openstack/ceilometer" + export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_BACKEND=mysql" + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh executable: /bin/bash |