Do not apply salt state if already applying a state

This commit is contained in:
Jason Ertel
2021-06-04 21:56:41 -04:00
parent e22421ec99
commit ba29b5e036
3 changed files with 6 additions and 7 deletions

View File

@@ -211,8 +211,10 @@ function syncElastic() {
echo "Database file does not exist yet, skipping users export"
fi
echo "Applying elastic state..."
salt-call state.apply elasticsearch queue=True
if [[ -z "$SKIP_STATE_APPLY" ]]; then
echo "Applying elastic state..."
salt-call state.apply elasticsearch queue=True
fi
}
function syncAll() {

View File

@@ -119,6 +119,8 @@ elastic_curl_config_distributed:
syncesusers:
cmd.run:
- name: so-user sync
- env:
- SKIP_STATE_APPLY: 'true'
- creates:
- /opt/so/saltstack/local/salt/elasticsearch/files/users
- /opt/so/saltstack/local/salt/elasticsearch/files/users_roles

View File

@@ -1,5 +0,0 @@
so_user_sync:
local.cmd.run:
- tgt: {{ data['data']['id'] }}
- arg:
- /usr/sbin/so-user sync