commit 6c065b313597f655d91e00003a2ddfbf4d7084a8
author Jakub Josef <jjosef@mirantis.com> Tue Feb 27 13:55:17 2018 +0000
committer Gerrit Code Review <gerrit2@56fc70e46927> Tue Feb 27 13:55:17 2018 +0000
tree 1ecb6da11171f66bb828cbac4b45262f956e1325
parent c2ef17c906414dcfba62eb543b2dc569592faf90
parent afad0c6a0feb4673d4b9201e823ed8a19370dd8d

Merge "Add kitchen tests for logging"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 5524d0d..01b7e3b 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -41,9 +41,9 @@
 
 
 platforms:
-  - name: <%=ENV['PLATFORM'] || 'ubuntu-xenial'%>
+  - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'trevorj/salty-whales:xenial'%>
+      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 1a41dc1..e1f03f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,14 +17,18 @@
   - bundle install
 
 env:
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=cluster
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=cluster
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-ceph
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-ceph
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single-barbican
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single-barbican
-    - PLATFORM=trevorj/salty-whales:trusty SUITE=single
-    - PLATFORM=trevorj/salty-whales:xenial SUITE=single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=cluster
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single-ceph
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single-barbican
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=single
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=cluster
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single-ceph
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single-barbican
+    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=single
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=cluster
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single-ceph
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single-barbican
+#    - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=single
 
 before_script:
   - set -o pipefail

glance/files/default

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