From 9f9bd97f9e847920e33a14609dbbb3f8c500de81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Sun, 31 Mar 2019 12:26:23 -0300
Subject: [PATCH] We don't need the daemons running at bootstrap time

---
 .travis.yml | 5 ++---
 kitchen.yml | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 37084bd..2961294 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,15 +15,14 @@ env:
     - INSTANCE: v2019-2-py3-centos-7
     - INSTANCE: v2019-2-py2-fedora-29
 
-    - INSTANCE: v2018-3-py2-opensuse-423
     - INSTANCE: v2018-3-py2-debian-8
     - INSTANCE: v2018-3-py2-ubuntu-1604
     - INSTANCE: v2018-3-py2-bootstrap-2016-11-centos-6
-    - INSTANCE: v2018-3-py2-forced-fedora-28
+    - INSTANCE: v2018-3-py2-forced-version-fedora-28
+    - INSTANCE: v2018-3-py2-opensuse-423
 
     - INSTANCE: v2017-7-py2-debian-8
     - INSTANCE: v2017-7-py2-ubuntu-1604
-    - INSTANCE: v2017-7-py2-centos-6
     - INSTANCE: v2017-7-py2-bootstrap-2016-11-centos-6
 
 script:
diff --git a/kitchen.yml b/kitchen.yml
index 776cba2..b807079 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -30,6 +30,7 @@ platforms:
 
 provisioner:
   name: salt_solo
+  salt_bootstrap_options: -X -d
   log_level: info
   require_chef: false
   formula: salt
@@ -151,7 +152,7 @@ suites:
 
   # To tests fedora 28 & salt v2018.2, we need to force the package version
   # otherwise the image, which includes the 'updates' repo, will install 2019.2
-  - name: v2018-3-py2-forced
+  - name: v2018-3-py2-forced-version
     includes:
       - fedora-28
     provisioner:
@@ -174,7 +175,6 @@ suites:
     includes:
       - debian-8
       - ubuntu-16.04
-      - centos-6
     provisioner:
       # We require an old version of salt in the provisioner or,
       # the salt formula fails to downgrade to the desired version to test