commit c2c0c61deb0571604c21a02bc40e69cc9e6bd985
author Jakub Pavlik <pavlk.jakub@gmail.com> Thu Aug 03 12:53:57 2017 +0000
committer Gerrit Code Review <gerrit2@980ef0291b9e> Thu Aug 03 12:53:58 2017 +0000
tree e237793d70b8e98047caeaec6adc0ef66b7fb574
parent bf3cfd35baf0eb8e3dca2a2d03e83be74e8031fa
parent 24ae6a8dfd0cc9c6f9394d3a5c7f9c5d800f161a

Merge "parametrized heat clients_keystone paramater"

.gitreview

diff --git a/.gitreview b/.gitreview
deleted file mode 100644
index 76d660f..0000000
--- a/.gitreview
+++ /dev/null
@@ -1,4 +0,0 @@
-[gerrit]
-host=gerrit.mcp.mirantis.net
-port=29418
-project=salt-formulas/heat.git

.kitchen.travis.yml

diff --git a/.kitchen.travis.yml b/.kitchen.travis.yml
new file mode 100644
index 0000000..f847543
--- /dev/null
+++ b/.kitchen.travis.yml
@@ -0,0 +1,6 @@
+suites:
+
+  - name: <%= ENV['SUITE'] %>
+    provisioner:
+      pillars-from-files:
+        neutron.sls: tests/pillar/<%= ENV['SUITE'] %>.sls

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 4f34af2..79f6159 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,8 +17,12 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty
-    - PLATFORM=trevorj/salty-whales:xenial
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_cluster
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_cluster
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_plugin_dirs
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_plugin_dirs
+    - PLATFORM=trevorj/salty-whales:trusty SUITE=server_single
+    - PLATFORM=trevorj/salty-whales:xenial SUITE=server_single
 
 
 before_script:
@@ -26,7 +30,7 @@
   - make test | tail
 
 script:
-  - test ! -e .kitchen.yml || bundle exec kitchen test -t tests/integration
+  - KITCHEN_LOCAL_YAML=.kitchen.travis.yml bundle exec kitchen test -t tests/integration
 
 notifications:
   webhooks:

heat/map.jinja

diff --git a/heat/map.jinja b/heat/map.jinja
index 075605e..01ef0f6 100644
--- a/heat/map.jinja
+++ b/heat/map.jinja
@@ -24,3 +24,9 @@
         'pkgs': ['python-heatclient'],
     },
 }, merge=pillar.heat.get('client', {})) %}
+
+{% set monitoring = salt['grains.filter_by']({
+    'default': {
+        'error_log_rate': 0.2,
+    },
+}, grain='os_family', merge=salt['pillar.get']('heat:monitoring')) %}

heat/meta/prometheus.yml

diff --git a/heat/meta/prometheus.yml b/heat/meta/prometheus.yml
index dc3d01c..5155e72 100644
--- a/heat/meta/prometheus.yml
+++ b/heat/meta/prometheus.yml
@@ -1,6 +1,6 @@
 {%- if pillar.heat.server is defined %}
 
-{%- from "heat/map.jinja" import server with context %}
+{%- from "heat/map.jinja" import server, monitoring with context %}
 {%- if server.get('enabled', False) %}
 {% raw %}
 server:
@@ -18,7 +18,7 @@
             Endpoint check for '{{ $labels.service }}' is down for 2 minutes
     HeatErrorLogsTooHigh:
 {%- endraw %}
-      {%- set log_threshold = prometheus_server.get('alert', {}).get('HeatErrorLogsTooHigh', {}).get('var', {}).get('threshold', 0.2 ) %}
+      {%- set log_threshold = monitoring.error_log_rate|float %}
       if: >-
         sum(rate(log_messages{service="heat",level=~"error|emergency|fatal"}[5m])) without (level) > {{ log_threshold }}
 {%- raw %}