commit 8ec16807f516013439cf10601e98d9e5e5df3daa
author mcp-jenkins <mcp-jenkins@mirantis.com> Wed Nov 07 13:54:04 2018 +0000
committer Gerrit Code Review <mail@domain.com> Wed Nov 07 13:54:04 2018 +0000
tree fa3b2e756d285b86eb862755fdc40f4de5f6d021
parent d4fe325c3946bfc571fa1e7e83f2b7c517f96c12
parent 5068299bc8e549751cbe575a8bc735b735c8654e

Merge "Allow threshold to be modified for individual pools"

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 42b967e..20eb727 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,7 +15,8 @@
     gem 'test-kitchen'
     gem 'kitchen-docker'
     gem 'kitchen-inspec'
-    gem 'inspec'
+    gem 'inspec', '<3.0.0'
+    #Version was frozen, because of issues in the version of inspec >3.0.0 -- see https://mirantis.jira.com/browse/PROD-24324 for more info
     gem 'kitchen-salt', :git => 'https://github.com/salt-formulas/kitchen-salt.git'
   - bundle install
 

ceph/backup.sls

diff --git a/ceph/backup.sls b/ceph/backup.sls
index e590490..7963e5c 100644
--- a/ceph/backup.sls
+++ b/ceph/backup.sls
@@ -63,6 +63,7 @@
   - hour: 2
 {%- endif %}
 {%- else %}
+  - minute: 0
   - hour: 2
 {%- endif %}
   - require:
@@ -163,6 +164,7 @@
   - hour: 2
 {%- endif %}
 {%- else %}
+  - minute: 0
   - hour: 2
 {%- endif %}
   - require:

ceph/osd/custom.sls

diff --git a/ceph/osd/custom.sls b/ceph/osd/custom.sls
index abdd6b9..a004663 100644
--- a/ceph/osd/custom.sls
+++ b/ceph/osd/custom.sls
@@ -1,4 +1,4 @@
-{%- from "ceph/map.jinja" import osd with context %}
+{%- from "ceph/map.jinja" import common, osd with context %}
 
 {% set ceph_version = pillar.ceph.common.version %}