openstack/vitrage
Code Issues Proposed changes

Extend default datasources settings

Browse Source 
Add ability to configure such datasources like:
* static (VITRAGE_USE_STATIC)
* doctor (VITRAGE_USE_DOCTOR)
* prometheus (VITRAGE_USE_PROMETHEUS)

All these datasources are disabled now by default.

Change-Id: I60b2810defbd5d2ce63a6408ed5a835efd7c6904
This commit is contained in:
Ivan Kolodyazhny 2019-04-05 22:12:17 +03:00
parent 022af0fc20
commit f296bbb942
3 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
devstack/gate_hook.sh
View File

@ -20,6 +20,7 @@ export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_NOTESTS=1 export DEVSTACK_GATE_TEMPEST_NOTESTS=1
export KEEP_LOCALRC=1 export KEEP_LOCALRC=1
DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin heat https://git.openstack.org/openstack/heat' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin heat https://git.openstack.org/openstack/heat'
DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin ceilometer https://git.openstack.org/openstack/ceilometer' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin ceilometer https://git.openstack.org/openstack/ceilometer'
DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin aodh https://git.openstack.org/openstack/aodh' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin aodh https://git.openstack.org/openstack/aodh'
@ -27,6 +28,11 @@ DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin mistral https://git.openstack.org/opens
DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage https://git.openstack.org/openstack/vitrage' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage https://git.openstack.org/openstack/vitrage'
DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage-tempest-plugin https://git.openstack.org/openstack/vitrage-tempest-plugin' DEVSTACK_LOCAL_CONFIG+=$'\nenable_plugin vitrage-tempest-plugin https://git.openstack.org/openstack/vitrage-tempest-plugin'
# enable them for gate testing they are disabled by default
DEVSTACK_LOCAL_CONFIG+=$'\nVITRAGE_USE_STATIC=1'
DEVSTACK_LOCAL_CONFIG+=$'\nVITRAGE_USE_DOCTOR=1'
DEVSTACK_LOCAL_CONFIG+=$'\nVITRAGE_USE_PROMETHEUS=1'
# we don't want swift # we don't want swift
DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service s-account s-container s-object s-proxy' DEVSTACK_LOCAL_CONFIG+=$'\ndisable_service s-account s-container s-object s-proxy'

15
devstack/plugin.sh
View File

@ -194,6 +194,21 @@ function configure_vitrage {
disable_vitrage_datasource nagios disable_vitrage_datasource nagios
fi fi
# remove static vitrage datasource if it's not enabled
if [[ "$VITRAGE_USE_STATIC" == "False" ]]; then
disable_vitrage_datasource static
fi
# remove doctor vitrage datasource if it's not enabled
if [[ "$VITRAGE_USE_DOCTOR" == "False" ]]; then
disable_vitrage_datasource doctor
fi
# remove prometheus vitrage datasource if it's not enabled
if [[ "$VITRAGE_USE_PROMETHEUS" == "False" ]]; then
disable_vitrage_datasource prometheus
fi
# add default datasources # add default datasources
iniset $VITRAGE_CONF datasources types $VITRAGE_DEFAULT_DATASOURCES iniset $VITRAGE_CONF datasources types $VITRAGE_DEFAULT_DATASOURCES

4
devstack/settings
View File

@ -32,6 +32,10 @@ VITRAGE_SERVICE_PORT=${VITRAGE_SERVICE_PORT:-8999}
# Toggle for deploying Vitrage with/without nagios # Toggle for deploying Vitrage with/without nagios
VITRAGE_USE_NAGIOS=$(trueorfalse False VITRAGE_USE_NAGIOS) VITRAGE_USE_NAGIOS=$(trueorfalse False VITRAGE_USE_NAGIOS)
VITRAGE_USE_STATIC=$(trueorfalse False VITRAGE_USE_STATIC)
VITRAGE_USE_DOCTOR=$(trueorfalse False VITRAGE_USE_DOCTOR)
VITRAGE_USE_PROMETHEUS=$(trueorfalse False VITRAGE_USE_PROMETHEUS)
VITRAGE_DEFAULT_DATASOURCES=${VITRAGE_DEFAULT_DATASOURCES:-nova.host,nova.instance,nova.zone,nagios,static,aodh,cinder.volume,neutron.network,neutron.port,heat.stack,doctor,prometheus,trove.instance,trove.cluster} VITRAGE_DEFAULT_DATASOURCES=${VITRAGE_DEFAULT_DATASOURCES:-nova.host,nova.instance,nova.zone,nagios,static,aodh,cinder.volume,neutron.network,neutron.port,heat.stack,doctor,prometheus,trove.instance,trove.cluster}
# for now dont use pip install for the client # for now dont use pip install for the client