create cassandra user if backup.server defined
Previously cassandra user was created only if
cron job has been set up which is wrong as
manual backup script run failed being unable
to exec rsync.
Besides that server-side backup\restore scripts
now are owned by root user and not cassandra
user as only root user is specified in cron.allow
anyway.
PROD-20823
Change-Id: Iac71571cead0b447f29ca4bb6449697434fc33b0
diff --git a/cassandra/backup.sls b/cassandra/backup.sls
index 833e049..62d130a 100644
--- a/cassandra/backup.sls
+++ b/cassandra/backup.sls
@@ -113,12 +113,6 @@
{%- if backup.server is defined %}
-{%- if backup.server.enabled %}
-
-cassandra_backup_server_packages:
- pkg.installed:
- - names: {{ backup.pkgs }}
-
cassandra_user:
user.present:
- name: cassandra
@@ -133,7 +127,6 @@
- makedirs: true
- require:
- user: cassandra_user
- - pkg: cassandra_backup_server_packages
{{ backup.backup_dir }}/.ssh:
file.directory:
@@ -153,6 +146,12 @@
- file: {{ backup.backup_dir }}/full
- file: {{ backup.backup_dir }}/.ssh
+{%- if backup.server.enabled %}
+
+cassandra_backup_server_packages:
+ pkg.installed:
+ - names: {{ backup.pkgs }}
+
cassandra_server_script:
file.managed:
- name: /usr/local/bin/cassandra-backup-runner.sh
@@ -167,7 +166,7 @@
cassandra_server_cron:
cron.present:
- name: /usr/local/bin/cassandra-backup-runner.sh
- - user: cassandra
+ - user: root
- minute: 0
- hour: 2
- require:
@@ -178,7 +177,7 @@
cassandra_server_cron:
cron.absent:
- name: /usr/local/bin/cassandra-backup-runner.sh
- - user: cassandra
+ - user: root
{%- endif %}