Merge pull request #19841 from marun/vagrant-fedora23

Auto commit by PR queue bot

cluster/vagrant/provision-master.sh

@@ -104,7 +104,7 @@ fi
 if ! which /usr/libexec/cockpit-ws &>/dev/null; then
 
   pushd /etc/yum.repos.d
-    wget https://copr.fedoraproject.org/coprs/sgallagh/cockpit-preview/repo/fedora-22/sgallagh-cockpit-preview-fedora-22.repo
+    curl -OL https://copr.fedorainfracloud.org/coprs/g/cockpit/cockpit-preview/repo/fedora-23/msuchy-cockpit-preview-fedora-23.repo
     dnf install -y cockpit cockpit-kubernetes
   popd
 

cluster/vagrant/provision-utils.sh

@@ -95,6 +95,20 @@ function install-salt() {
   if ! which salt-call >/dev/null 2>&1; then
     # Install salt binaries
     curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s
+
+    # Fedora >= 23 includes salt packages but the bootstrap is
+    # creating configuration for a (non-existent) salt repo anyway.
+    # Remove the invalid repo to prevent dnf from warning about it on
+    # every update.  Assume this problem is specific to Fedora 23 and
+    # will fixed by the time another version of Fedora lands.
+    local fedora_version=$(grep 'VERSION_ID' /etc/os-release | sed 's+VERSION_ID=++')
+    if [[ "${fedora_version}" = '23' ]]; then
+      local repo_file='/etc/yum.repos.d/saltstack-salt-fedora-23.repo'
+      if [[ -f "${repo_file}" ]]; then
+        rm "${repo_file}"
+      fi
+    fi
+
   fi
 }