Add include on restore state to init
Change-Id: Iaac543bd8065fa8304b835544bf02bffb71881f9
Related: PROD-27521 (PROD:27521)
(cherry picked from commit 59131bcde3cb3c11efccd30dee9b157a64af0c9b)
diff --git a/xtrabackup/client/init.sls b/xtrabackup/client/init.sls
index 1d17196..1533622 100644
--- a/xtrabackup/client/init.sls
+++ b/xtrabackup/client/init.sls
@@ -28,12 +28,14 @@
- group: root
- makedirs: true
-{%- if client.cron %}
xtrabackup_client_runner_cron:
cron.present:
- name: /usr/local/bin/innobackupex-runner.sh
- user: root
+{%- if client.cron is not defined %}
+ - commented: true
+{%- endif %}
{%- if client.backup_times is defined %}
{%- if client.backup_times.day_of_week is defined %}
- dayweek: {{ client.backup_times.day_of_week }}
@@ -63,13 +65,8 @@
- require:
- file: xtrabackup_client_runner_script
-{%- else %}
-
-xtrabackup_client_runner_cron:
- cron.absent:
- - name: /usr/local/bin/innobackupex-runner.sh
- - user: root
-
+{%- if client.restore_full_latest is defined %}
+include:
+- xtrabackup.client.restore
{%- endif %}
-
{%- endif %}
diff --git a/xtrabackup/client/restore.sls b/xtrabackup/client/restore.sls
index 5fc4d57..d6780e1 100644
--- a/xtrabackup/client/restore.sls
+++ b/xtrabackup/client/restore.sls
@@ -1,8 +1,4 @@
{%- from "xtrabackup/map.jinja" import client with context %}
-{%- if client.enabled %}
-
-{%- if client.restore_full_latest is defined %}
-
xtrabackup_client_restore_script:
file.managed:
- name: /usr/local/bin/innobackupex-restore.sh
@@ -26,7 +22,3 @@
- unless: "[ -e {{ client.backup_dir }}/dbrestored ]"
- require:
- file: xtrabackup_client_call_restore_script
-
-{%- endif %}
-
-{%- endif %}