From d71cf0c4f9ba716b93b784993f0409337e60fa18 Mon Sep 17 00:00:00 2001
From: RemiChristiaan <remi-christiaan.cool@vbhi.com>
Date: Mon, 27 Jul 2020 14:23:21 +0200
Subject: [PATCH] fix(service): service salt-master and salt-minion to restart
 last

When running a high-state on the salt-master to deploy itself, the run fails
with an Authentication error occurred because the master restarts half way though.
---
 salt/master.sls | 1 +
 salt/minion.sls | 1 +
 2 files changed, 2 insertions(+)

diff --git a/salt/master.sls b/salt/master.sls
index 29cf496..10d5bb3 100644
--- a/salt/master.sls
+++ b/salt/master.sls
@@ -61,6 +61,7 @@ salt-master:
       - file: salt-master
            {%- endif %}
       - file: remove-old-master-conf-file
+    - order: last
     {% endif %}
     {% if salt_settings.master_remove_config %}
 remove-default-master-conf-file:
diff --git a/salt/minion.sls b/salt/minion.sls
index 1997332..0963282 100644
--- a/salt/minion.sls
+++ b/salt/minion.sls
@@ -107,6 +107,7 @@ salt-minion:
     - name: {{ salt_settings.minion_service }}
     - watch:
       - file: remove-old-minion-conf-file
+    - order: last
     {% endif %}
     {%- if not salt_settings.restart_via_at %}
   cmd.run: