commit 8869f8068c9d766e0528d021bdb18a6a7fd18d75
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Jul 25 12:07:21 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Wed Jul 25 12:07:21 2018 +0000
tree 0b69073e49df3a18e5531b1ebba1c216ad1cbaac
parent 29768a356d7b30f71d1ecc10aaf86372a0033c42
parent 79212d60d031fd645d589aed00ab721c498f3dbf

Merge "Add Salt 2018.3 tests"

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 737f353..f76d32b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+language: python
+python:
+- "2.7.13"
 sudo: required
 services:
   - docker

metadata.yml

diff --git a/metadata.yml b/metadata.yml
index ebca36d..0c6ef3f 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,3 +1,3 @@
 name: "mysql"
 version: "0.2"
-source: "https://github.com/tcpcloud/salt-formula-mysql"
+source: "https://github.com/salt-formulas/salt-formula-mysql"

mysql/client/server.sls

diff --git a/mysql/client/server.sls b/mysql/client/server.sls
index 222def2..c933fc2 100644
--- a/mysql/client/server.sls
+++ b/mysql/client/server.sls
@@ -77,6 +77,7 @@
   - defaults:
     database_name: {{ database_name }}
     database: {{ database }}
+    backup_dir: {{ client.backup_dir }}
   - require:
     - mysql_database: mysql_{{ server_name }}_database_{{ database_name }}
 

mysql/conf/restore.sh

diff --git a/mysql/conf/restore.sh b/mysql/conf/restore.sh
index 791fa49..9153181 100755
--- a/mysql/conf/restore.sh
+++ b/mysql/conf/restore.sh
@@ -9,7 +9,7 @@
 
 {%- if database.initial_data.source != 'localhost' %}
 
-scp backupninja@{{ database.initial_data.source }}:/srv/backupninja/{{ host }}{{ path }}mysql.{{ age }}/sqldump/{{ source_name }} /root/mysql/data/{{ source_name }}
+scp backupninja@{{ database.initial_data.source }}:{{ backup_dir }}/{{ host }}{{ path }}mysql.{{ age }}/sqldump/{{ source_name }} /root/mysql/data/{{ source_name }}
 
 gunzip -c /root/mysql/data/{{ source_name }} | mysql -u{{ database.users[0].name }} -p{{ database.users[0].password }} {{ database_name }}
 

mysql/map.jinja

diff --git a/mysql/map.jinja b/mysql/map.jinja
index 1114aef..d372c2c 100644
--- a/mysql/map.jinja
+++ b/mysql/map.jinja
@@ -29,6 +29,7 @@
 
 {%- set client = salt['grains.filter_by']({
     'default': {
+        'backup_dir': '/srv/backupninja'
     },
 }, merge=salt['pillar.get']('mysql:client')) %}
 

mysql/meta/backupninja.yml

diff --git a/mysql/meta/backupninja.yml b/mysql/meta/backupninja.yml
index 80c192c..36daf17 100644
--- a/mysql/meta/backupninja.yml
+++ b/mysql/meta/backupninja.yml
@@ -2,4 +2,5 @@
   mysql:
     fs_includes:
     - /var/backups/mysql
-    fs_excludes: []
+    fs_excludes:
+    - xtrabackup