Always execute backup when triggered
* Add backup source host to known_hosts if missed
PROD-30107
PROD-30108
Change-Id: If9cf268117115158836acf39c51ef424c0bb682e
diff --git a/salt/files/restore_master.sh b/salt/files/restore_master.sh
index 9ac6100..2629f42 100644
--- a/salt/files/restore_master.sh
+++ b/salt/files/restore_master.sh
@@ -4,6 +4,7 @@
{%- if master.initial_data is defined %}
mkdir -p /etc/salt/pki.bak
mv /etc/salt/pki/* /etc/salt/pki.bak
+ssh-keygen -F {{ master.initial_data.source }} || ssh-keyscan -H {{ master.initial_data.source }} >> /root/.ssh/known_hosts
scp -r backupninja@{{ master.initial_data.source }}:{{ master.initial_data.get('home_dir', '/srv/backupninja') }}/{{ master.initial_data.host }}/etc/salt/pki/pki.0/* /etc/salt/pki
RC=$?
if [ $RC -gt 0 ]; then
diff --git a/salt/master/restore.sls b/salt/master/restore.sls
index fe0ff3f..63ae5fd 100644
--- a/salt/master/restore.sls
+++ b/salt/master/restore.sls
@@ -12,18 +12,10 @@
salt_master_restore_state:
cmd.run:
- name: /srv/salt/restore_master.sh
- - unless: "test -e /srv/salt/master-restored"
- cwd: /root
- require:
- file: /srv/salt/restore_master.sh
-salt_master_restore_completed:
- file.managed:
- - name: /srv/salt/master-restored
- - source: {}
- - require:
- - cmd: salt_master_restore_state
-
{%- endif %}
{%- endif %}