openstack/deb-sahara
Code Issues Proposed changes

Fixed topology parameters help in config

Browse Source 
There is no way to make multi-line help for config parameters.
Official documentation contains description of required format
for the files. Removing this information from config parameters
description.

Change-Id: I32682b1ecf951d0c6990e06325ef29fb30b3ca54
Closes-Bug: #1407837
This commit is contained in:
Andrew Lazarev 2015-01-06 10:28:47 -08:00
parent e556f3331b
commit 7b884b1455
2 changed files with 23 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
etc/sahara/sahara.conf.sample
View File

@ -337,27 +337,22 @@
# when returning it. (list value) # when returning it. (list value)
#plugins = vanilla,hdp,spark #plugins = vanilla,hdp,spark
# Enables data locality for hadoop cluster. Also # Enables data locality for hadoop cluster. Also enables data locality
# enables data locality for Swift used by hadoop. If # for Swift used by hadoop. If enabled, 'compute_topology' and
# enabled, 'compute_topology' and 'swift_topology' # 'swift_topology' configuration parameters should point to OpenStack
# configuration parameters should point to OpenStack and Swift # and Swift topology correspondingly. (boolean value)
# topology correspondingly. (boolean value)
#enable_data_locality = false #enable_data_locality = false
# Enables four-level topology for data locality. Works # Enables four-level topology for data locality. Works only if
# only if corresponding plugin supports such mode. (boolean value) # corresponding plugin supports such mode. (boolean value)
#enable_hypervisor_awareness = true #enable_hypervisor_awareness = true
# File with nova compute topology. It should contain # File with nova compute topology. It should contain mapping between
# mapping between nova computes and racks. File # nova computes and racks. (string value)
# format: compute1 /rack1 compute2
# /rack2 compute3 /rack2 (string value)
#compute_topology_file = etc/sahara/compute.topology #compute_topology_file = etc/sahara/compute.topology
# File with Swift topology. It should contain mapping # File with Swift topology.It should contain mapping between Swift
# between Swift nodes and racks. File format: # nodes and racks. (string value)
# node1 /rack1 node2 /rack2 node3
# /rack2 (string value)
#swift_topology_file = etc/sahara/swift.topology #swift_topology_file = etc/sahara/swift.topology
# Notification level for outgoing notifications (string value) # Notification level for outgoing notifications (string value)

32
sahara/topology/topology_helper.py
View File

@ -38,31 +38,25 @@ LOG = log.getLogger(__name__)
opts = [ opts = [
cfg.BoolOpt('enable_data_locality', cfg.BoolOpt('enable_data_locality',
default=False, default=False,
help="""Enables data locality for hadoop cluster. help="Enables data locality for hadoop cluster. "
Also enables data locality for Swift used by hadoop. "Also enables data locality for Swift used by hadoop. "
If enabled, 'compute_topology' and 'swift_topology' "If enabled, 'compute_topology' and 'swift_topology' "
configuration parameters should point to OpenStack and Swift "configuration parameters should point to OpenStack and "
topology correspondingly."""), "Swift topology correspondingly."),
cfg.BoolOpt('enable_hypervisor_awareness', cfg.BoolOpt('enable_hypervisor_awareness',
default=True, default=True,
help="""Enables four-level topology for data locality. help="Enables four-level topology for data locality. "
Works only if corresponding plugin supports such mode."""), "Works only if corresponding plugin supports such mode."),
cfg.StrOpt('compute_topology_file', cfg.StrOpt('compute_topology_file',
default='etc/sahara/compute.topology', default='etc/sahara/compute.topology',
help="""File with nova compute topology. help="File with nova compute topology. "
It should contain mapping between nova computes and racks. "It should contain mapping between nova computes and "
File format: "racks."),
compute1 /rack1
compute2 /rack2
compute3 /rack2"""),
cfg.StrOpt('swift_topology_file', cfg.StrOpt('swift_topology_file',
default='etc/sahara/swift.topology', default='etc/sahara/swift.topology',
help="""File with Swift topology. help="File with Swift topology."
It should contain mapping between Swift nodes and racks. "It should contain mapping between Swift nodes and "
File format: "racks.")
node1 /rack1
node2 /rack2
node3 /rack2""")
] ]
CONF = cfg.CONF CONF = cfg.CONF