Merge "start panko before ceilometer"
This commit is contained in:
commit
4702b89ab3
@ -173,9 +173,6 @@
|
|||||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||||
|
|
||||||
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi"
|
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi"
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
|
|
||||||
|
|
||||||
case "$ZUUL_BRANCH" in
|
case "$ZUUL_BRANCH" in
|
||||||
stable/liberty|stable/mitaka) break;;
|
stable/liberty|stable/mitaka) break;;
|
||||||
@ -185,6 +182,9 @@
|
|||||||
export PROJECTS="openstack/panko $PROJECTS"
|
export PROJECTS="openstack/panko $PROJECTS"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
|
||||||
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
||||||
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
|
||||||
|
|
||||||
case "$ZUUL_BRANCH" in
|
case "$ZUUL_BRANCH" in
|
||||||
stable/liberty|stable/1.3) break ;;
|
stable/liberty|stable/1.3) break ;;
|
||||||
@ -237,9 +237,6 @@
|
|||||||
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
export DEVSTACK_GATE_INSTALL_TESTONLY=1
|
||||||
|
|
||||||
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi openstack/oslo.messaging openstack/devstack-plugin-{plugin}"
|
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi openstack/oslo.messaging openstack/devstack-plugin-{plugin}"
|
||||||
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
|
|
||||||
|
|
||||||
case "$ZUUL_BRANCH" in
|
case "$ZUUL_BRANCH" in
|
||||||
stable/liberty|stable/mitaka) break;;
|
stable/liberty|stable/mitaka) break;;
|
||||||
@ -248,6 +245,9 @@
|
|||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin panko git://git.openstack.org/openstack/panko"
|
||||||
export PROJECTS="openstack/panko $PROJECTS"
|
export PROJECTS="openstack/panko $PROJECTS"
|
||||||
esac
|
esac
|
||||||
|
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
|
||||||
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
|
||||||
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin aodh git://git.openstack.org/openstack/aodh"
|
||||||
|
|
||||||
case "$ZUUL_BRANCH" in
|
case "$ZUUL_BRANCH" in
|
||||||
stable/liberty|stable/1.3) break ;;
|
stable/liberty|stable/1.3) break ;;
|
||||||
|
Loading…
Reference in New Issue
Block a user