From 3b68b68304136af0837c06acdd9c4670bac40a01 Mon Sep 17 00:00:00 2001 From: James Page Date: Sat, 10 Oct 2015 14:39:17 -0700 Subject: [PATCH] Move ring init to config changes to avoid shifting six version during install --- hooks/swift_hooks.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/hooks/swift_hooks.py b/hooks/swift_hooks.py index ac67e11..43fcfdb 100755 --- a/hooks/swift_hooks.py +++ b/hooks/swift_hooks.py @@ -107,16 +107,6 @@ def install(): apt_install(pkgs, fatal=True) apt_install(extra_pkgs, fatal=True) 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. ensure_www_dir_permissions(get_www_dir()) @@ -124,6 +114,16 @@ def install(): @hooks.hook('config-changed') @pause_aware_restart_on_change(restart_map()) 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'): setup_ipv6()