commit 26cc90f55f7e5fefd0700c665ff94a777640b0e9
author Jakub Josef <jjosef@mirantis.com> Tue Feb 27 13:57:28 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Feb 27 13:57:28 2018 +0000
tree bfd9eae152bbe2d043a1c021db1dfbd344453943
parent 8851d6114039ef555ca8ba0065660acf1aa7244f
parent 962d1477f860b6b42a5083a3f2cc69258b5926e8

Merge "Add kitchen tests for logging"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index a14a20a..4992d02 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -40,9 +40,9 @@
   sudo: true
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial-2017.7'%>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial-2017.7'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index 325550a..716836a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,11 +17,12 @@
   - bundle install
 
 env:
-  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-cluster
-  # - PLATFORM=trevorj/salty-whales:trusty-2017.7 SUITE=server-single
-  # Missing Trusty packages for aodh
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-cluster
-  - PLATFORM=trevorj/salty-whales:xenial-2017.7 SUITE=server-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-cluster
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=server-single
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-cluster
+  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=server-single
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-cluster
+#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=server-single
 
 before_script:
   - set -o pipefail

aodh/files/default

diff --git a/aodh/files/default b/aodh/files/default
index b0259c6..960e5c3 100644
--- a/aodh/files/default
+++ b/aodh/files/default
@@ -1,4 +1,4 @@
 # Generated by Salt.
 {% if values.logging.log_appender %}
-DAEMON_ARGS="--log-config-append=/etc/aodh/logging/logging-{{ service_name }}.conf"
+DAEMON_ARGS="${DAEMON_ARGS} --log-config-append=/etc/aodh/logging/logging-{{ service_name }}.conf"
 {% endif %}