openstack/horizon
Code Issues Proposed changes

Merge "Replacing data_processing with data-processing"

Browse Source
This commit is contained in:
Jenkins
2015-03-09 09:28:48 +00:00
committed by Gerrit Code Review
parent 2f8f7ed6a4 8c4a2cd126
commit 8b3d51f1dd
4 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/ref/local_conf.rst
View File

@@ -50,7 +50,7 @@ that Horizon supports in DevStack when `stack.sh` is run.
enable_service q-vpn
# end group
# enable Sahara (data_processing) Service
# enable Sahara (data-processing) Service
enable_service sahara
# enable Trove (database) Service

4
doc/source/topics/settings.rst
View File

@@ -424,7 +424,7 @@ edited.
Default::
{
"data_processing": 1.1,
"data-processing": 1.1,
"identity": 2.0,
"volume": 2
}
@@ -439,7 +439,7 @@ OpenStack dashboard to use a specific API version for a given service API.
use of the decimal point, so valid options would be "2.0" or "3".
For example,
OPENSTACK_API_VERSIONS = {
"data_processing": 1.1,
"data-processing": 1.1,
"identity": 3,
"volume": 2
}

2
openstack_dashboard/api/sahara.py
View File

@@ -25,7 +25,7 @@ LOG = logging.getLogger(__name__)
# "type" of Sahara service registered in keystone
SAHARA_SERVICE = 'data_processing'
SAHARA_SERVICE = 'data-processing'
SAHARA_AUTO_IP_ALLOCATION_ENABLED = getattr(
settings,

2
openstack_dashboard/local/local_settings.py.example
View File

@@ -33,7 +33,7 @@ TEMPLATE_DEBUG = DEBUG
# service API. For example, The identity service APIs have inconsistent
# use of the decimal point, so valid options would be 2.0 or 3.
#OPENSTACK_API_VERSIONS = {
# "data_processing": 1.1,
# "data-processing": 1.1,
# "identity": 3,
# "volume": 2,
#}