From 59d4141d6a5876533b08e0e5c6ec96416c37ba76 Mon Sep 17 00:00:00 2001
From: portdirect <pete@port.direct>
Date: Thu, 8 Feb 2018 10:51:50 -0500
Subject: [PATCH] Update to F27 and update docker packages

This PS moves the fedora gates to use F27. It also updates
the docker packages used for both fedora and centos

Change-Id: Ic5ab5793d7176a81a8ea70c82b1d53a1fdf5f740
---
 .zuul.yaml                                    | 16 ++++++++--------
 .../playbooks/deploy-docker/tasks/main.yaml   | 14 +++++++++++++-
 .../templates/centos-docker.service.j2        | 16 +++++++---------
 .../templates/fedora-docker.service.j2        | 19 +++++++++----------
 4 files changed, 37 insertions(+), 28 deletions(-)

diff --git a/.zuul.yaml b/.zuul.yaml
index 4127b828d..ac17279c6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -76,11 +76,11 @@
     name: openstack-helm-fedora
     nodes:
       - name: primary
-        label: fedora-26
+        label: fedora-27
       - name: node-1
-        label: fedora-26
+        label: fedora-27
       - name: node-2
-        label: fedora-26
+        label: fedora-27
     groups:
       - name: primary
         nodes:
@@ -143,15 +143,15 @@
     name: openstack-helm-five-node-fedora
     nodes:
       - name: primary
-        label: fedora-26
+        label: fedora-27
       - name: node-1
-        label: fedora-26
+        label: fedora-27
       - name: node-2
-        label: fedora-26
+        label: fedora-27
       - name: node-3
-        label: fedora-26
+        label: fedora-27
       - name: node-4
-        label: fedora-26
+        label: fedora-27
     groups:
       - name: primary
         nodes:
diff --git a/tools/gate/playbooks/deploy-docker/tasks/main.yaml b/tools/gate/playbooks/deploy-docker/tasks/main.yaml
index 4d33d2000..6a4463768 100644
--- a/tools/gate/playbooks/deploy-docker/tasks/main.yaml
+++ b/tools/gate/playbooks/deploy-docker/tasks/main.yaml
@@ -52,6 +52,18 @@
     dest: /etc/systemd/system/docker.service.d/http-proxy.conf
     mode: 0640
 
+- name: centos | add docker-ce repository
+  when: ( ansible_distribution == 'CentOS' or ansible_distribution == 'Red Hat Enterprise Linux' ) and ( need_docker | failed )
+  get_url:
+    url: https://download.docker.com/linux/centos/docker-ce.repo
+    dest: /etc/yum.repos.d/docker-ce.repo
+
+- name: fedora | add docker-ce repository
+  when: ( ansible_distribution == 'Fedora' ) and ( need_docker | failed )
+  get_url:
+    url: https://download.docker.com/linux/fedora/docker-ce.repo
+    dest: /etc/yum.repos.d/docker-ce.repo
+
 - name: deploy docker packages
   when: need_docker | failed
   include_role:
@@ -62,7 +74,7 @@
       deb:
         - docker.io
       rpm:
-        - docker-latest
+        - docker-ce
 
 - name: restarting docker
   systemd:
diff --git a/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2 b/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2
index dfac46188..ba9540e2d 100644
--- a/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2
+++ b/tools/gate/playbooks/deploy-docker/templates/centos-docker.service.j2
@@ -1,8 +1,8 @@
 [Unit]
 Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target
-Wants=docker-latest-storage-setup.service
+Documentation=https://docs.docker.com
+After=network-online.target firewalld.service
+Wants=network-online.target
 
 [Service]
 Type=notify
@@ -10,13 +10,11 @@ NotifyAccess=all
 Environment=GOTRACEBACK=crash
 Environment=DOCKER_HTTP_HOST_COMPAT=1
 Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
-ExecStart=/usr/bin/dockerd-latest \
-          --add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \
-          --default-runtime=docker-runc \
+ExecStart=/usr/bin/dockerd \
           --exec-opt native.cgroupdriver=systemd \
-          --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
-          -g /var/lib/docker \
-          --storage-driver=overlay \
+          --userland-proxy-path=/usr/libexec/docker/docker-proxy \
+          --data-root=/var/lib/docker \
+          --storage-driver=overlay2 \
           --log-driver=json-file \
           --iptables=false
 ExecReload=/bin/kill -s HUP $MAINPID
diff --git a/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2 b/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2
index c6ba16b7d..e471b92f3 100644
--- a/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2
+++ b/tools/gate/playbooks/deploy-docker/templates/fedora-docker.service.j2
@@ -1,20 +1,19 @@
 [Unit]
 Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target docker-latest-containerd.service
-Wants=docker-latest-storage-setup.service
-Requires=docker-latest-containerd.service
+Documentation=https://docs.docker.com
+After=network-online.target firewalld.service
+Wants=network-online.target
 
 [Service]
 Type=notify
 Environment=GOTRACEBACK=crash
-ExecStart=/usr/bin/dockerd-latest \
-          --add-runtime oci=/usr/libexec/docker/docker-runc-latest \
-          --default-runtime=oci \
-          --containerd /run/containerd.sock \
+# the default is not to use systemd for cgroups because the delegate issues still
+# exists and systemd currently does not support the cgroup feature set required
+# for containers run by docker
+ExecStart=/usr/bin/dockerd \
           --exec-opt native.cgroupdriver=systemd \
-          --userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
-          -g /var/lib/docker \
+          --userland-proxy-path=/usr/libexec/docker/docker-proxy \
+          --data-root=/var/lib/docker \
           --storage-driver=overlay2 \
           --log-driver=json-file \
           --iptables=false