Merge "Install epel via dib for centos builds"

nodepool/nodepool.yaml

@@ -874,12 +874,14 @@ diskimages:
       - growroot
       - infra-package-needs
       - stackviz
+      - epel
     env-vars:
       TMPDIR: /opt/dib_tmp
       DIB_CHECKSUM: '1'
       DIB_IMAGE_CACHE: /opt/dib_cache
       QEMU_IMG_OPTIONS: compat=0.10
       DIB_GRUB_TIMEOUT: '0'
+      DIB_EPEL_DISABLED: '1'
   - name: fedora-25
     elements:
       - fedora-minimal

tools/build-image.sh

@@ -52,6 +52,14 @@ if [ ! -f ${ZUUL_USER_SSH_PUBLIC_KEY} ]; then
     exit 1
 fi
 
+## Several parts of infra node bringup require EPEL, but we don't want
+## to introduce dependencies on it, so keep disabled.
+if [[ ${DISTRO} == "centos-minimal" ]]; then
+    EXTRA_ELEMENTS+="epel "
+    export DIB_EPEL_DISABLED=1
+fi
+
+
 ## If your firewall won't allow outbound DNS connections, you'll want
 ## to set these to local resolvers
 # export NODEPOOL_STATIC_NAMESERVER_V4=192.168.0.1