openstack/grenade
Code Issues Proposed changes

Remove trove

Browse Source 
There is currently no grenade testing of Trove, and we are working
to move trove devstack support into a plugin.  Remove the few
references to trove in this repo.

Change-Id: I7671a657be48cf9ae0211a51e4bc08867a231c73
This commit is contained in:
James E. Blair 2015-03-26 13:07:52 -07:00 committed by Sean Dague
parent bfa23e401b
commit 55a6dd32a2
3 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
functions-common
View File

@ -1817,7 +1817,6 @@ function enable_service {
# **glance** returns true if any service enabled start with **g-**
# **neutron** returns true if any service enabled start with **q-**
# **swift** returns true if any service enabled start with **s-**
# **trove** returns true if any service enabled start with **tr-**
# For backward compatibility if we have **swift** in ENABLED_SERVICES all the
# **s-** services will be enabled. This will be deprecated in the future.
#
@ -1854,7 +1853,6 @@ function is_service_enabled {
[[ ${service} == "glance" && ${ENABLED_SERVICES} =~ "g-" ]] && enabled=0
[[ ${service} == "ironic" && ${ENABLED_SERVICES} =~ "ir-" ]] && enabled=0
[[ ${service} == "neutron" && ${ENABLED_SERVICES} =~ "q-" ]] && enabled=0
[[ ${service} == "trove" && ${ENABLED_SERVICES} =~ "tr-" ]] && enabled=0
[[ ${service} == "swift" && ${ENABLED_SERVICES} =~ "s-" ]] && enabled=0
[[ ${service} == s-* && ${ENABLED_SERVICES} =~ "swift" ]] && enabled=0
[[ ${service} == key-* && ${ENABLED_SERVICES} =~ "key" ]] && enabled=0

1
tools/generate_javelin_resources.py
View File

@ -31,7 +31,6 @@ DEVSTACK_SERVICE_MAP = {
'keystone': 'key',
'nova': 'n-',
'neutron': 'q-',
'trove': 'tr-',
'swift': 's-',
}

1
upgrade-tempest
View File

@ -65,7 +65,6 @@ source $TARGET_DEVSTACK_DIR/lib/neutron
source $TARGET_DEVSTACK_DIR/lib/nova
source $TARGET_DEVSTACK_DIR/lib/sahara
source $TARGET_DEVSTACK_DIR/lib/swift
source $TARGET_DEVSTACK_DIR/lib/trove
source $TARGET_DEVSTACK_DIR/lib/zaqar
# The following devstack libraries may have dependencies on service-specific