openstack
/
magnum
Code Issues Proposed changes

Disable horizon, ceilomter and swift in gate hook 

If the services are disabled in the devstack/settings file, it disables
them for everyone who uses the magnum devstack plugin. Some people (like
shade) use both magnum and swift to test things. Putting this in the
gate hook means it's used in all of magnum's jobs, but not in other
people's jobs.

Change-Id: Icd82a4ab68533f39f967575c2125b0f61c70e0a6
This commit is contained in:
Monty Taylor 2016-12-09 13:44:27 -06:00
parent 5ede934aaf
commit ff6514f5bc
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
2 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
devstack/settings
View File

@ -27,24 +27,6 @@ enable_service q-l3
enable_service q-meta
enable_service neutron
# Disable horizon
disable_service horizon
# Disable swift
disable_service s-account
disable_service s-container
disable_service s-object
disable_service s-proxy
# Disable ceilometer
disable_service ceilometer-acentral
disable_service ceilometer-acompute
disable_service ceilometer-alarm-evaluator
disable_service ceilometer-alarm-notifier
disable_service ceilometer-anotification
disable_service ceilometer-api
disable_service ceilometer-collector
# Enable Magnum services
enable_service magnum-api
enable_service magnum-cond

12
magnum/tests/contrib/gate_hook.sh
View File

@ -21,6 +21,18 @@ special=$2
export PROJECTS="openstack/barbican $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin heat git://git.openstack.org/openstack/heat"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service horizon"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-object"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-proxy"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acentral"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-acompute"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-evaluator"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-alarm-notifier"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-api"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service ceilometer-collector"
if [ "$coe" = "mesos" ]; then
echo "MAGNUM_GUEST_IMAGE_URL=https://fedorapeople.org/groups/magnum/ubuntu-mesos-latest.qcow2" >> $BASE/new/devstack/localrc
elif [ "$coe" = "k8s-coreos" ]; then