From 1ab8c712e492427ce121cd33ab58aabec5848551 Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Fri, 20 Jan 2023 15:17:04 -0500 Subject: [PATCH 1/2] remove exit condition --- salt/playbook/files/automation_user_create.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/salt/playbook/files/automation_user_create.sh b/salt/playbook/files/automation_user_create.sh index bc827fda6..7279d13cc 100644 --- a/salt/playbook/files/automation_user_create.sh +++ b/salt/playbook/files/automation_user_create.sh @@ -2,8 +2,6 @@ # {%- set admin_pass = salt['pillar.get']('secrets:playbook_admin', None) -%} # {%- set automation_pass = salt['pillar.get']('secrets:playbook_automation', None) %} -set -e - local_salt_dir=/opt/so/saltstack/local try_count=6 From d3cb57bba2dd2745c737f3de4a6458531c3fc5cf Mon Sep 17 00:00:00 2001 From: Josh Brower Date: Mon, 23 Jan 2023 08:16:28 -0500 Subject: [PATCH 2/2] Rerun the playbook state --- salt/common/tools/sbin/so-playbook-reset | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/salt/common/tools/sbin/so-playbook-reset b/salt/common/tools/sbin/so-playbook-reset index 9907e1807..d58078997 100755 --- a/salt/common/tools/sbin/so-playbook-reset +++ b/salt/common/tools/sbin/so-playbook-reset @@ -9,7 +9,11 @@ . /usr/sbin/so-common -salt-call state.apply playbook.db_init,playbook,playbook.automation_user_create +salt-call state.apply playbook.db_init,playbook + +/usr/sbin/so-soctopus-restart + +salt-call state.apply playbook,playbook.automation_user_create /usr/sbin/so-soctopus-restart