Skip to content

Commit

Permalink
Update for compatibility with SaltStack 2019.2
Browse files Browse the repository at this point in the history
As stated in https://docs.saltstack.com/en/latest/topics/releases/2019.2.0.html
Add the usage of `tojson` filter. This change is compatible with
2018.3.3 as per that docs.
Update kitchen, travis, Gemfile
  • Loading branch information
carlosalvesuy committed Jun 7, 2019
1 parent ae06a94 commit 591bfdf
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
2 changes: 1 addition & 1 deletion .kitchen.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ formula_name = formula['name']
%>
---
platforms:
- name: ubuntu-14.04
- name: ubuntu-16.04
- name: ubuntu-18.04

provisioner:
name: salt_solo
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
language: ruby

rvm:
- 2.2.5
- 2.4.1

sudo: required
services: docker

env:
matrix:
- INSTANCE=default-ubuntu-1404
- INSTANCE=default-ubuntu-1604
- INSTANCE=default-ubuntu-1804

# https://github.com/zuazo/kitchen-in-travis-native/issues/1#issuecomment-142455888
before_script: sudo iptables -L DOCKER || sudo iptables -N DOCKER
Expand Down
6 changes: 3 additions & 3 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
source 'https://rubygems.org'

ruby '2.2.5'
ruby '2.4.1'

gem "test-kitchen"
gem "test-kitchen", '>=2.2.4'
gem "kitchen-docker"
gem "kitchen-salt", :git => 'https://github.com/devopxteam/kitchen-salt.git'
gem "kitchen-salt"
gem 'kitchen-inspec'
gem "kitchen-vagrant"
2 changes: 1 addition & 1 deletion xinetd/config.sls
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ xinetd_{{ service }}_config:
- template: jinja
- context:
service: {{ service }}
config: {{ config }}
config: {{ config|tojson }}
- watch_in:
service: xinetd
{% endfor %}
Expand Down

0 comments on commit 591bfdf

Please sign in to comment.