openstack/charm-swift-proxy
Code Issues Proposed changes

Move ring init to config changes to avoid shifting six version during install

Browse Source
This commit is contained in:
James Page
2015-10-10 14:39:17 -07:00
parent ae383fba6a
commit 3b68b68304
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
hooks/swift_hooks.py
View File

@@ -107,16 +107,6 @@ def install():
apt_install(pkgs, fatal=True) apt_install(pkgs, fatal=True)
apt_install(extra_pkgs, fatal=True) apt_install(extra_pkgs, fatal=True)
ensure_swift_dir() ensure_swift_dir()
if is_elected_leader(SWIFT_HA_RES):
log("Leader established, generating ring builders", level=INFO)
# initialize new storage rings.
for path in SWIFT_RINGS.itervalues():
initialize_ring(path,
config('partition-power'),
config('replicas'),
config('min-hours'))
# configure a directory on webserver for distributing rings. # configure a directory on webserver for distributing rings.
ensure_www_dir_permissions(get_www_dir()) ensure_www_dir_permissions(get_www_dir())
@@ -124,6 +114,16 @@ def install():
@hooks.hook('config-changed') @hooks.hook('config-changed')
@pause_aware_restart_on_change(restart_map()) @pause_aware_restart_on_change(restart_map())
def config_changed(): def config_changed():
if is_elected_leader(SWIFT_HA_RES):
log("Leader established, generating ring builders", level=INFO)
# initialize new storage rings.
for path in SWIFT_RINGS.itervalues():
if not os.path.exists(path):
initialize_ring(path,
config('partition-power'),
config('replicas'),
config('min-hours'))
if config('prefer-ipv6'): if config('prefer-ipv6'):
setup_ipv6() setup_ipv6()