feat(ng): add retry_options to fix installation on centos-8

saltstack-formulas · Apr 1, 2020 · 90bd91c · 90bd91c
1 parent 3ebb354
commit 90bd91c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 2 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -62,14 +62,14 @@ jobs:
     # - env: INSTANCE=default-ubuntu-1804-master-py3
     - env: INSTANCE=default-centos-8-master-py3
     # - env: INSTANCE=default-fedora-31-master-py3
-    # - env: INSTANCE=suse-opensuse-leap-151-master-py3
+    - env: INSTANCE=suse-opensuse-leap-151-master-py3
     # - env: INSTANCE=default-amazonlinux-2-master-py3
     # - env: INSTANCE=default-arch-base-latest-master-py2
     # - env: INSTANCE=default-debian-10-3000-py3
     - env: INSTANCE=default-ubuntu-1804-3000-py3
     # - env: INSTANCE=default-centos-8-3000-py3
     # - env: INSTANCE=default-fedora-31-3000-py3
-    - env: INSTANCE=suse-opensuse-leap-151-3000-py3
+    # - env: INSTANCE=suse-opensuse-leap-151-3000-py3
     - env: INSTANCE=default-amazonlinux-2-3000-py3
     # - env: INSTANCE=default-arch-base-latest-3000-py2
     # - env: INSTANCE=default-debian-10-2019-2-py3

diff --git a/pillar.example b/pillar.example
@@ -84,3 +84,10 @@ varnish:
           source_path: salt://testing/mobile_detect.vcl
     varnishncsa:
       enabled: true  # Manage varnishncsa service
+
+    # https://docs.saltstack.com/en/latest/ref/states/requisites.html#retrying-states
+    retry_options:
+      attempts: 3
+      until: true
+      interval: 15
+      splay: 15
diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls
@@ -13,3 +13,8 @@ varnish:
         -f /etc/varnish/default.vcl
         -S /etc/varnish/secret
         -s malloc,100m
+    retry_options:
+      attempts: 3
+      until: true
+      interval: 5
+      splay: 5
diff --git a/varnish/ng/install.sls b/varnish/ng/install.sls
@@ -6,3 +6,6 @@
 varnish.install:
   pkg.installed:
     - name: {{ varnish_settings.pkg }}
+    {%- if varnish_settings.get('retry_options', {}) %}
+    - retry: {{ varnish_settings.retry_options | json }}
+    {%- endif %}
diff --git a/varnish/ng/repo.sls b/varnish/ng/repo.sls
@@ -11,6 +11,9 @@ varnish.repo.dependencies:
         - pkgs:
             - apt-transport-https
             - python{{ pkg_dep_pyver }}-apt
+        {%- if varnish_settings.get('retry_options', {}) %}
+        - retry: {{ varnish_settings.retry_options | json }}
+        {%- endif %}
         - require_in:
             - pkgrepo: varnish.repo.{{ varnish_settings.repo }}
             - pkgrepo: varnish.repo.{{ varnish_settings.repo }}_src
@@ -47,6 +50,9 @@ varnish.repo.dependencies:
             - pygpgme
             {% endif %}
             - yum-utils
+        {%- if varnish_settings.get('retry_options', {}) %}
+        - retry: {{ varnish_settings.retry_options | json }}
+        {%- endif %}
         - require_in:
             {% if salt['grains.get']('osfinger', '') in ['CentOS Linux-7', 'Amazon Linux-2'] %}
             - pkgrepo: varnish_epel_repo