Merge lp:~gnuoy/charms/trusty/keystone/restart-horror into lp:~openstack-charmers-archive/charms/trusty/keystone/next

[Liam Young]

Unmerged revisions

189. By Liam Young on 2015-10-15

Restart hook after upgrade

=== modified symlink 'hooks/config-changed' (properties changed: -x to +x)
=== target was u'keystone_hooks.py'
--- hooks/config-changed	1970-01-01 00:00:00 +0000
+++ hooks/config-changed	2015-10-15 13:31:32 +0000
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+./hooks/config-changed.real
+RC=$?
+if [[ $RC -eq 200 ]]; then
+    ./hooks/config-changed.real
+    RC=$?
+fi
+exit $RC
 
=== modified file 'hooks/keystone_hooks.py'
--- hooks/keystone_hooks.py	2015-10-08 22:29:33 +0000
+++ hooks/keystone_hooks.py	2015-10-15 13:31:32 +0000
@@ -129,7 +129,7 @@
     git_install(config('openstack-origin-git'))
 
 
[e-mail]('config-changed')
[e-mail]('config-changed.real')
 @restart_on_change(restart_map())
 @synchronize_ca_if_changed(fatal=True)
 def config_changed():
 
=== modified file 'hooks/keystone_utils.py'
--- hooks/keystone_utils.py	2015-10-06 19:19:34 +0000
+++ hooks/keystone_utils.py	2015-10-15 13:31:32 +0000
@@ -1,4 +1,5 @@
 #!/usr/bin/python
+import sys
 import glob
 import grp
 import hashlib
@@ -396,7 +397,7 @@
             log("Database not ready - deferring to shared-db relation",
                 level=INFO)
             return
-
+    sys.exit(200)
 
 def is_db_initialised():
     if relation_ids('cluster'):