possibility to absent public key from backup server
PROD-17856
Change-Id: I82c6ac447600be76317d5819864af7c16fa64c43
diff --git a/zookeeper/backup.sls b/zookeeper/backup.sls
index 7c64ce7..f6342f8 100644
--- a/zookeeper/backup.sls
+++ b/zookeeper/backup.sls
@@ -24,13 +24,12 @@
- group: root
- makedirs: true
+{%- if backup.cron %}
+
zookeeper_backup_runner_cron:
cron.present:
- name: /usr/local/bin/zookeeper-backup-runner.sh
- user: root
-{%- if not backup.cron %}
- - commented: True
-{%- endif %}
{%- if backup.client.backup_times is defined %}
{%- if backup.client.backup_times.dayOfWeek is defined %}
- dayweek: {{ backup.client.backup_times.dayOfWeek }}
@@ -60,6 +59,16 @@
- require:
- file: zookeeper_backup_runner_script
+{%- else %}
+
+zookeeper_backup_runner_cron:
+ cron.absent:
+ - name: /usr/local/bin/zookeeper-backup-runner.sh
+ - user: root
+
+{%- endif %}
+
+
{%- if backup.client.restore_latest is defined %}
zookeeper_backup_restore_script:
@@ -147,6 +156,13 @@
- require:
- file: {{ backup.backup_dir }}/full
+{%- else %}
+
+zookeeper_key_{{ key.key }}:
+ ssh_auth.absent:
+ - user: zookeeper
+ - name: {{ key.key }}
+
{%- endif %}
{%- endfor %}
@@ -160,18 +176,26 @@
- require:
- pkg: zookeeper_backup_server_packages
+{%- if backup.cron %}
+
zookeeper_server_cron:
cron.present:
- name: /usr/local/bin/zookeeper-backup-runner.sh
- user: zookeeper
-{%- if not backup.cron %}
- - commented: True
-{%- endif %}
- minute: 0
- hour: 2
- require:
- file: zookeeper_server_script
+{%- else %}
+
+zookeeper_server_cron:
+ cron.absent:
+ - name: /usr/local/bin/zookeeper-backup-runner.sh
+ - user: zookeeper
+
+{%- endif %}
+
zookeeper_server_call_restore_script:
file.managed:
- name: /usr/local/bin/zookeeper-restore-call.sh