From 4231029c6296d6ce44497cb15232ef25c1533cf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Javier=20B=C3=A9rtoli?= <javier@netmanagers.com.ar>
Date: Mon, 1 Apr 2019 09:50:27 -0300
Subject: [PATCH] Changed Redhat's repo name and file

To match the one used by the bootstrapper. Otherwhise, we end up with two repos configured
---
 kitchen.yml                  | 18 ++++++++++++------
 salt/pkgrepo/redhat/init.sls |  1 +
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/kitchen.yml b/kitchen.yml
index 7d78585..61afc15 100644
--- a/kitchen.yml
+++ b/kitchen.yml
@@ -22,7 +22,7 @@ platforms:
   - name: debian-8
   - name: ubuntu-16.04
   - name: fedora-28
-  # Fails on Debian due to vsyscall issues, see
+  # centos-6 guest fails on Debian hosts due to vsyscall issues, see
   # https://hub.docker.com/_/centos, "A note about vsyscall"
   - name: centos-6
     driver:
@@ -85,6 +85,13 @@ suites:
       - ubuntu-18.04
       - centos-7
     provisioner:
+      # If we don't force bootstrapping with python3, centos bootstraps using python2
+      # and then, when switching the repo to python3 and tries to install
+      # the packages, complains with
+      # Downloading packages:
+      #   https://repo.saltstack.com/py3/re.........rpm: [Errno -1] Package does not
+      # match intended download. Suggestion: run yum --enablerepo=saltstack clean metadata
+      salt_bootstrap_options: -X -x python3 -d git %s
       salt_version: '2019.2'
       pillars:
         salt.sls:
@@ -132,13 +139,12 @@ suites:
       inspec_tests:
         - path: test/integration/2018-3
 
-  # To test salt on centos-6 we need to first use a python-2.6 version of salt (2016.11)
-  # and then upgrade it. See https://github.com/saltstack/salt/issues/47864
+  # centos-6 ships with python2.6, so it requires extra bootstrapping parameters
+  # to install python2.7
   - name: v2018-3-py2-bootstrap
     includes:
       - centos-6
     provisioner:
-      # As centos-6 ships with python2.6, we use the bootstrapper to install python2.7
       salt_bootstrap_options: -X -d stable %s
       salt_version: '2018.3'
       pillars:
@@ -188,8 +194,8 @@ suites:
       inspec_tests:
         - path: test/integration/2017-7
 
-  # To test salt on centos-6 we need to first use a python-2.6 version of salt (2016.11)
-  # and then upgrade it. See https://github.com/saltstack/salt/issues/47864
+  # centos-6 ships with python2.6, so it requires extra bootstrapping parameters
+  # to install python2.7
   - name: v2017-7-py2-bootstrap
     includes:
       - centos-6
diff --git a/salt/pkgrepo/redhat/init.sls b/salt/pkgrepo/redhat/init.sls
index 4badc5f..6a81dd8 100644
--- a/salt/pkgrepo/redhat/init.sls
+++ b/salt/pkgrepo/redhat/init.sls
@@ -3,6 +3,7 @@
 {%- if grains['os']|lower not in ('amazon', 'fedora') %}
 saltstack-pkgrepo:
   pkgrepo.managed:
+    - name: saltstack
     - humanname: SaltStack repo for RHEL/CentOS $releasever
     - baseurl: {{ salt_settings.pkgrepo }}
     - enabled: 1