Merge "Optimize kitchen tests for Travis CI"
diff --git a/README.rst b/README.rst
index 8a29afa..cf21103 100644
--- a/README.rst
+++ b/README.rst
@@ -73,6 +73,16 @@
key: ssh-key
+Backup client with local storage
+
+.. code-block:: yaml
+
+ backupninja:
+ client:
+ enabled: true
+ target:
+ engine: local
+
More information
================
diff --git a/backupninja/client.sls b/backupninja/client.sls
index 13a5401..fd0f0bd 100644
--- a/backupninja/client.sls
+++ b/backupninja/client.sls
@@ -134,6 +134,8 @@
- require:
- pkg: backupninja_packages
+{%- if client.target.engine not in ["local"] %}
+
backupninja_remote_handler_{{ client.target.engine }}:
file.managed:
- name: /etc/backup.d/200.backup.{{ client.target.engine }}
@@ -143,6 +145,8 @@
- require:
- pkg: backupninja_packages
+{%- endif %}
+
{%- if client.target.auth is defined and client.target.auth.gss is defined %}
backupninja_gss_helper_kinit:
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index a4cac88..db89554 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -113,7 +113,7 @@
}
salt_run() {
- [ -e ${VEN_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
+ [ -e ${VENV_DIR}/bin/activate ] && source ${VENV_DIR}/bin/activate
salt-call ${SALT_OPTS} $*
}