Skip to content

Commit

Permalink
salt: "Reconfigure salt-minion" even on first node install
Browse files Browse the repository at this point in the history
Before this commit we were only calling the "Reconfigure salt-minion"
state if we are not on first node deployment, but state may do some
changes that require a Salt minion process to restart.

For example the salt package get hold only when you call the salt minion
state when salt already installed
  • Loading branch information
TeddyAndrieux committed Apr 9, 2021
1 parent 181f326 commit 67b8978
Showing 1 changed file with 1 addition and 5 deletions.
6 changes: 1 addition & 5 deletions salt/metalk8s/orchestrate/deploy_node.sls
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Accept key:
- require:
- salt: Deploy salt-minion on a new node

Wait minion available:
Wait minion available ssh:
salt.runner:
- name: metalk8s_saltutil.wait_minions
- tgt: {{ node_name }}
Expand Down Expand Up @@ -73,8 +73,6 @@ Sync module on the node:
- kwarg:
saltenv: {{ saltenv }}

{%- if node_name in salt.saltutil.runner('manage.up') %}

Check pillar before salt-minion configuration:
salt.function:
- name: metalk8s.check_pillar_keys
Expand Down Expand Up @@ -123,8 +121,6 @@ Wait minion available:
- require_in:
- http: Wait for API server to be available before highstate

{%- endif %}

{%- if 'etcd' in roles and 'etcd' not in skip_roles %}

Check pillar before etcd deployment:
Expand Down

0 comments on commit 67b8978

Please sign in to comment.