openstack/deb-sahara
Code Issues Proposed changes

Made Swift topology optional for data locality

Browse Source 
Change-Id: I80d33543cc2173dd62beab17f811f0f8e162a078
Closes-Bug: #1257945
This commit is contained in:
Andrew Lazarev 2014-06-02 17:21:08 -07:00
parent 1983bc1103
commit 85707cda6b
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sahara/topology/topology_helper.py
View File

@ -68,6 +68,7 @@ CONF.register_opts(opts)
def _read_swift_topology():
LOG.debug("Reading Swift nodes topology from %s", CONF.swift_topology_file)
topology = {}
try:
with open(CONF.swift_topology_file) as f:
@ -78,13 +79,16 @@ def _read_swift_topology():
(host, path) = line.split()
topology[host] = path
except IOError:
raise ex.NotFoundException(
CONF.swift_topology_file,
"Unable to find file %s with Swift topology")
LOG.debug("Unable to read Swift nodes topology from %s",
CONF.swift_topology_file)
return {}
return topology
def _read_compute_topology():
LOG.debug("Reading compute nodes topology from %s",
CONF.compute_topology_file)
ctx = context.ctx()
tenant_id = str(ctx.tenant_id)
topology = {}