openstack/vitrage
Code Issues Proposed changes

fix local config due to devstack change in gate

Browse Source 
Change-Id: Ia997aae10ffc1583c510d3f6e10eaea2785b96a5
This commit is contained in:
Eyal 2017-02-26 13:59:43 +02:00
parent 7d451e6113
commit 011a187f58
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
devstack/gate_hook.sh
View File

@ -30,25 +30,9 @@ DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin aodh git://git.openstack.org/openstack/
DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service ceilometer-alarm-evaluator,ceilometer-alarm-notifier' DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service ceilometer-alarm-evaluator,ceilometer-alarm-notifier'
DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service n-net' DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service n-net'
export DEVSTACK_LOCAL_CONFIG DEVSTACK_LOCAL_CONFIG+="$(cat <<EOF
if [ -z ${ENABLED_SERVICES+x} ]; then
ENABLED_SERVICES=tempest
fi
ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
ENABLED_SERVICES+=,h-eng h-api h-api-cfn h-api-cw
ENABLED_SERVICES+=,vitrage-api,vitrage-graph
ENABLED_SERVICES+=,key,aodi-api,aodh-notifier,aodh-evaluator
ENABLED_SERVICES+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
ENABLED_SERVICES+=,ceilometer-api
ENABLED_SERVICES+=,aodh-api
export ENABLED_SERVICES
GATE_DEST=$BASE/new
DEVSTACK_PATH=$GATE_DEST/devstack
cat > $DEVSTACK_PATH/local.conf <<EOF
[[post-config|\$NOVA_CONF]] [[post-config|\$NOVA_CONF]]
[DEFAULT] [DEFAULT]
notification_topics = notifications,vitrage_notifications notification_topics = notifications,vitrage_notifications
@ -64,9 +48,6 @@ notification_driver = messagingv2
notification_topics = notifications,vitrage_notifications notification_topics = notifications,vitrage_notifications
notification_driver = messagingv2 notification_driver = messagingv2
[oslo_messaging_notifications]
transport_url = rabbit://$RABBIT_USERID:$RABBIT_PASSWORD@$RABBIT_HOST:5672/
[[post-config|\$HEAT_CONF]] [[post-config|\$HEAT_CONF]]
[DEFAULT] [DEFAULT]
notification_topics = notifications,vitrage_notifications notification_topics = notifications,vitrage_notifications
@ -85,5 +66,23 @@ changes_interval = 5
[datasources] [datasources]
snapshots_interval = 120 snapshots_interval = 120
EOF EOF
)"
export DEVSTACK_LOCAL_CONFIG
if [ -z ${ENABLED_SERVICES+x} ]; then
ENABLED_SERVICES=tempest
fi
ENABLED_SERVICES+=,q-svc,q-dhcp,q-meta,q-agt,q-l3
ENABLED_SERVICES+=,h-eng h-api h-api-cfn h-api-cw
ENABLED_SERVICES+=,vitrage-api,vitrage-graph
ENABLED_SERVICES+=,key,aodi-api,aodh-notifier,aodh-evaluator
ENABLED_SERVICES+=,ceilometer-alarm-evaluator,ceilometer-alarm-notifier
ENABLED_SERVICES+=,ceilometer-api
ENABLED_SERVICES+=,aodh-api
export ENABLED_SERVICES
GATE_DEST=$BASE/new
DEVSTACK_PATH=$GATE_DEST/devstack
$GATE_DEST/devstack-gate/devstack-vm-gate.sh $GATE_DEST/devstack-gate/devstack-vm-gate.sh