Merge ~vultaire/charm-graylog:lp1879363 into charm-graylog:master

[Paul Goins]

[Xav Paice (xavpaice)]

LGTM

review: Approve

[Jeremy Lounder (jldev)]

review: Approve

diff --git a/reactive/graylog.py b/reactive/graylog.py
index 4c3c81f..3db920c 100644
--- a/reactive/graylog.py
+++ b/reactive/graylog.py
@@ -326,12 +326,18 @@ def report_status():
 @when_not('graylog_api.configured')
 def configure_graylog_api(*discard):
     """Adjust states to ensure API dependents will be correctly configured."""
-    _verify_rest_api_is_alive()
-    remove_state('beat.setup')
-    remove_state('graylog_index_sets.configured')
-    remove_state('graylog_inputs.configured')
-    remove_state('graylog_nagios.configured')
-    set_state('graylog_api.configured')
+    try:
+        _verify_rest_api_is_alive()
+    except ApiTimeout:
+        # Corner case: ES/Mongo are up, but REST API is not up yet.
+        # Just wait (status already set in report_status()) and try again next time.
+        pass
+    else:
+        remove_state('beat.setup')
+        remove_state('graylog_index_sets.configured')
+        remove_state('graylog_inputs.configured')
+        remove_state('graylog_nagios.configured')
+        set_state('graylog_api.configured')
 
 
 @when('graylog.configured')  # noqa: C901