commit ffeda5f9e7d6d9c2bdbd98d99ef002306dd132de
author Aleksey Zvyagintsev <azvyagintsev@mirantis.com> Wed Aug 01 20:08:58 2018 +0000
committer Gerrit Code Review <gerrit2@84b5d06f6116> Wed Aug 01 20:08:58 2018 +0000
tree 108ea2e155284ef5f33a2e63354ddc3a73349cff
parent abe7cc315eec4b1d7d69c92c2811863d32e44a21
parent e27a2eaf06b7d0c76d4d2a1379dc6f25749ba500

Merge "README update"

.kitchen.yml

diff --git a/.kitchen.yml b/.kitchen.yml
index 2c481f8..ac702d1 100644
--- a/.kitchen.yml
+++ b/.kitchen.yml
@@ -31,7 +31,7 @@
 platforms:
   - name: <%=ENV['PLATFORM'] ||  'saltstack-ubuntu-xenial-salt-stable' %>
     driver_config:
-      image: <%=ENV['PLATFORM'] || 'epcim/salt-formulas:saltstack-ubuntu-xenial-salt-stable'%>
+      image: <%=ENV['PLATFORM'] || 'epcim/salt:saltstack-ubuntu-xenial-salt-stable'%>
       platform: ubuntu
 
 suites:

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index b20c029..224bbe1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,6 @@
+language: python
+python:
+- "2.7.13"
 sudo: required
 services:
   - docker
@@ -17,12 +20,16 @@
   - bundle install
 
 env:
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-server
-#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-ssl-server
-  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-server
-#  - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-ssl-server
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-server
-  # - PLATFORM=epcim/salt-formulas:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-ssl-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-server
+#  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2016.3 SUITE=rabbitmq-ssl-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-server
+#  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2017.7 SUITE=rabbitmq-ssl-server
+  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=rabbitmq-server
+#  - PLATFORM=epcim/salt:saltstack-ubuntu-xenial-salt-2018.3 SUITE=rabbitmq-ssl-server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2017.7 SUITE=rabbitmq-ssl-server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=rabbitmq-server
+  # - PLATFORM=epcim/salt:saltstack-ubuntu-bionic-salt-2018.3 SUITE=rabbitmq-ssl-server
 
 before_script:
   - set -o pipefail