Merge branch 'fix/settings-retry' into 'master'

fix(settings): applying settings may need retries

See merge request la-crise/discourse-formula!9

discourse/setup/settings/global.sls

@@ -54,3 +54,8 @@ discourse-setup-settings-global-import-cmd-run:
     - cwd: {{ discourse.directory }}
     - require:
       - sls: {{ sls_service_running }}
+    - retry:
+        attempts: 5
+        until: True
+        interval: 5
+        splay: 2

discourse/setup/settings/oauth2.sls

@@ -64,4 +64,9 @@ discourse-setup-settings-oauth2-import-cmd-run:
     - cwd: {{ discourse.directory }}
     - require:
       - sls: {{ sls_service_running }}
+    - retry:
+        attempts: 5
+        until: True
+        interval: 5
+        splay: 2
 {%- endif %}

docs/README.rst

@@ -92,6 +92,33 @@ This state will rebuild the ``discourse`` application container if the
 This state will initialize the ``discourse`` application with sane
 defaults.
 
+``discourse.setup.settings``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+*Meta-state (This is a state that includes other states)*.
+
+This state will load series of settings.
+
+``discourse.setup.settings.global``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This state will configure some ``discourse`` `site settings`_ with
+values from salt configuration.
+
+It depends on ``discourse.service.running``.
+
+``discourse.setup.settings.oauth2``
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+This state will configure the ``discourse`` `OAuth2 plugin settings`_ with
+values from salt configuration.
+
+Note that the values from salt configuration are named like the
+`OAuth2 pluging settings`_ except that the ``oauth2_`` prefix is
+removed. See `pillar.example`_.
+
+It depends on ``discourse.service.running``.
+
 ``discourse.setup.users``
 ^^^^^^^^^^^^^^^^^^^^^^^^^