x/anvil
Code Issues Proposed changes

Merge pull request #43 from hagleitn/master

Browse Source 
swift stuff
This commit is contained in:
Gunther Hagleitner 2012-02-04 17:17:18 -08:00
commit aa49cfc6cf
5 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
conf/logging.ini
View File

@ -6,7 +6,7 @@
keys=root keys=root
[logger_root] [logger_root]
level=INFO level=DEBUG
handlers=hand01 handlers=hand01
formatter=form01 formatter=form01

8
devstack/components/swift.py
View File

@ -120,7 +120,8 @@ class SwiftInstaller(comp.PythonInstallComponent):
def __create_node_config(self, node_number, port): def __create_node_config(self, node_number, port):
for type_ in ['object', 'container', 'account']: for type_ in ['object', 'container', 'account']:
sh.copy_replace_file(sh.joinpths(self.cfgdir, '%s-server.conf' % type_), sh.copy_replace_file(sh.joinpths(self.cfgdir, '%s-server.conf' % type_),
sh.joinpths(self.cfgdir, '%s-server/%d' % (type_, node_number)), sh.joinpths(self.cfgdir, '%s-server/%d.conf' \
% (type_, node_number)),
{ {
'%NODE_PATH%': sh.joinpths(self.datadir, str(node_number)), '%NODE_PATH%': sh.joinpths(self.datadir, str(node_number)),
'%BIND_PORT%': str(port), '%BIND_PORT%': str(port),
@ -128,12 +129,17 @@ class SwiftInstaller(comp.PythonInstallComponent):
}) })
port += 1 port += 1
def __delete_templates(self):
for type_ in ['object', 'container', 'account']:
sh.unlink(sh.joinpths(self.cfgdir, '%s-server.conf' % type_))
def __create_nodes(self): def __create_nodes(self):
for i in range(1, 5): for i in range(1, 5):
sh.mkdirslist(sh.joinpths(self.fs_dev, '%d/node' % i)) sh.mkdirslist(sh.joinpths(self.fs_dev, '%d/node' % i))
sh.symlink(sh.joinpths(self.fs_dev, str(i)), sh.symlink(sh.joinpths(self.fs_dev, str(i)),
sh.joinpths(self.datadir, str(i))) sh.joinpths(self.datadir, str(i)))
self.__create_node_config(i, 6010 + (i - 1) * 5) self.__create_node_config(i, 6010 + (i - 1) * 5)
self.__delete_templates()
def __turn_on_rsync(self): def __turn_on_rsync(self):
sh.symlink(sh.joinpths(self.cfgdir, RSYNC_CONF), sh.symlink(sh.joinpths(self.cfgdir, RSYNC_CONF),

3
devstack/progs/actions.py
View File

@ -388,7 +388,8 @@ def _run_action(args):
all_components_deps = common.get_components_deps(action, components) all_components_deps = common.get_components_deps(action, components)
component_diff = set(all_components_deps.keys()).difference(components.keys()) component_diff = set(all_components_deps.keys()).difference(components.keys())
if component_diff: if component_diff:
LOG.info("Having to activate dependent components: [%s]" % (", ".join(sorted(component_diff)))) LOG.info("Having to activate dependent components: [%s]" \
% (", ".join(sorted(component_diff))))
for new_component in component_diff: for new_component in component_diff:
components[new_component] = list() components[new_component] = list()
component_order = utils.get_components_order(all_components_deps) component_order = utils.get_components_order(all_components_deps)

4
devstack/progs/common.py
View File

@ -71,7 +71,7 @@ ACTION_CLASSES = {
settings.GLANCE: glance.GlanceRuntime, settings.GLANCE: glance.GlanceRuntime,
settings.QUANTUM: quantum.QuantumRuntime, settings.QUANTUM: quantum.QuantumRuntime,
settings.SWIFT: swift.SwiftRuntime, settings.SWIFT: swift.SwiftRuntime,
settings.SWIFT: swift_keystone.SwiftKeystoneRuntime, settings.SWIFT_KEYSTONE: swift_keystone.SwiftKeystoneRuntime,
settings.HORIZON: horizon.HorizonRuntime, settings.HORIZON: horizon.HorizonRuntime,
settings.KEYSTONE: keystone.KeystoneRuntime, settings.KEYSTONE: keystone.KeystoneRuntime,
settings.DB: db.DBRuntime, settings.DB: db.DBRuntime,
@ -86,7 +86,7 @@ ACTION_CLASSES = {
settings.GLANCE: glance.GlanceRuntime, settings.GLANCE: glance.GlanceRuntime,
settings.QUANTUM: quantum.QuantumRuntime, settings.QUANTUM: quantum.QuantumRuntime,
settings.SWIFT: swift.SwiftRuntime, settings.SWIFT: swift.SwiftRuntime,
settings.SWIFT: swift_keystone.SwiftKeystoneRuntime, settings.SWIFT_KEYSTONE: swift_keystone.SwiftKeystoneRuntime,
settings.HORIZON: horizon.HorizonRuntime, settings.HORIZON: horizon.HorizonRuntime,
settings.KEYSTONE: keystone.KeystoneRuntime, settings.KEYSTONE: keystone.KeystoneRuntime,
settings.DB: db.DBRuntime, settings.DB: db.DBRuntime,

4
devstack/settings.py
View File

@ -70,8 +70,8 @@ COMPONENT_DEPENDENCIES = {
GLANCE: [KEYSTONE, DB], GLANCE: [KEYSTONE, DB],
KEYSTONE: [DB], KEYSTONE: [DB],
NOVA: [KEYSTONE, GLANCE, DB, RABBIT, NOVA_CLIENT], NOVA: [KEYSTONE, GLANCE, DB, RABBIT, NOVA_CLIENT],
SWIFT: [], SWIFT_KEYSTONE: [KEYSTONE_CLIENT],
SWIFT_KEYSTONE: [SWIFT], SWIFT: [SWIFT_KEYSTONE],
NOVA_CLIENT: [], NOVA_CLIENT: [],
HORIZON: [KEYSTONE_CLIENT, GLANCE, NOVA_CLIENT], HORIZON: [KEYSTONE_CLIENT, GLANCE, NOVA_CLIENT],
#the db isn't always a dependency (depending on the quantum component to be activated) #the db isn't always a dependency (depending on the quantum component to be activated)