Merge pull request #18737 from dcbw/dind-f27

Automatic merge from submit-queue.

dind: switch images to Fedora 27

Remove the centos base image too; it can't and wasn't being used.

@openshift/networking @danwinship @marun

Author: openshift-merge-robot

images/dind/Dockerfile

@@ -18,7 +18,7 @@
 #      $ docker run -d --privileged openshift/dind
 #
 
-FROM fedora:25
+FROM fedora:27
 
 # Fix 'WARNING: terminal is not fully functional' when TERM=dumb
 ENV TERM=xterm
@@ -49,19 +49,16 @@ RUN systemctl mask\
 RUN cp /usr/lib/systemd/system/dbus.service /etc/systemd/system/;\
  sed -i 's/OOMScoreAdjust=-900//' /etc/systemd/system/dbus.service
 
-# Remove non-english translations for glibc to reduce image size by 100mb.
-# docker-v1.10-migrator is unnecessary for a new docker installation
-# selinux-policy-minimum is unnecessary since selinux won't be enabled
+# Remove non-english translations (by explicitly installing just the English
+# ones) for glibc to reduce image size by 100mb.  Also install various network
+# utils for network debugging.
 RUN dnf -y update && dnf -y install\
  docker\
  glibc-langpack-en\
  iptables\
  openssh-clients\
- openssh-server
-
-# Install network utils for debugging
-# iproute2 tools are already installed.
-RUN dnf -y install tcpdump
+ openssh-server\
+ tcpdump
 
 ## Configure docker
 

images/dind/Dockerfile.centos7

@@ -23,6 +23,7 @@ RUN dnf -y update && dnf -y install\
  iptables-services\
  conntrack-tools\
  openvswitch\
+ openvswitch-ovn-*\
  python-netaddr\
  python2-pyroute2\
  python2-requests\
@@ -32,14 +33,6 @@ RUN dnf -y update && dnf -y install\
 # Remove the CRI-O CNI network configs so openshift-sdn's will be used instead
 RUN rm -f /etc/cni/net.d/*
 
-# Upgrade to a newer OVS and install OVN packages that are only available
-# with the newer release. (This can go away when the base image is upgraded to
-# OVS 2.8 prerelease or release versions and include OVN sub-packages)
-RUN dnf -y install dnf-plugins-core &&\
- dnf -y copr enable danw/origin-dind-ovs &&\
- dnf -y update openvswitch &&\
- dnf -y install openvswitch-ovn-*
-
 # A default deny firewall (either iptables or firewalld) is
 # installed by default on non-cloud fedora and rhel, so all
 # network plugins need to be able to work with one enabled.