Try doing the entire rekey/reissue thing twice, since that seems to

work when doing it manually.   This may be a timing issue.

svn path=/branches/tk671/; revision=5727

1 files changed, 16 insertions, 13 deletions

diff --git a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
index c612e0f1..3889ea90 100644
--- a/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
+++ b/rpkid/upgrade-scripts/upgrade-irdbd-to-0.5678.py
@@ -41,25 +41,28 @@ import rpki.autoconf
 
 rpkic = os.path.join(rpki.autoconf.sbindir, "rpkic")
 
-print "Pausing to let RPKI daemons start up"
-time.sleep(10)
-
 handles = subprocess.check_output((rpkic, "list_self_handles")).splitlines()
 
-for handle in handles:
+for i in (1, 2):
+
+  print "Pass #%d" % i 
+  time.sleep(10)
+
+  for h in handles:
 
-  print "Processing", handle
+    print "Processing", h
 
-  print "Asking parent to reissue with new key"
-  subprocess.check_call((rpkic, "-i", handle, "up_down_rekey"))
+    print "Asking parent to reissue with new key"
+    subprocess.check_call((rpkic, "-i", h, "up_down_rekey"))
 
-  print "Asking parent to revoke old key"
-  subprocess.check_call((rpkic, "-i", handle, "up_down_revoke"))
+    print "Asking parent to revoke old key"
+    subprocess.check_call((rpkic, "-i", h, "up_down_revoke"))
+    time.sleep(10)
 
-  print "Reissuing everything"
-  subprocess.check_call((rpkic, "-i", handle, "force_reissue"))
+    print "Reissuing everything"
+    subprocess.check_call((rpkic, "-i", h, "force_reissue"))
 
-  print "Forcing publication"
-  subprocess.check_call((rpkic, "-i", handle, "force_publication"))
+    print "Forcing publication"
+    subprocess.check_call((rpkic, "-i", h, "force_publication"))
 
 ''')