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
This commit is contained in:
parent
e72b2cfa21
commit
59d4141d6a
16
.zuul.yaml
16
.zuul.yaml
@ -76,11 +76,11 @@
|
|||||||
name: openstack-helm-fedora
|
name: openstack-helm-fedora
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
- name: node-1
|
- name: node-1
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
- name: node-2
|
- name: node-2
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
groups:
|
groups:
|
||||||
- name: primary
|
- name: primary
|
||||||
nodes:
|
nodes:
|
||||||
@ -143,15 +143,15 @@
|
|||||||
name: openstack-helm-five-node-fedora
|
name: openstack-helm-five-node-fedora
|
||||||
nodes:
|
nodes:
|
||||||
- name: primary
|
- name: primary
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
- name: node-1
|
- name: node-1
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
- name: node-2
|
- name: node-2
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
- name: node-3
|
- name: node-3
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
- name: node-4
|
- name: node-4
|
||||||
label: fedora-26
|
label: fedora-27
|
||||||
groups:
|
groups:
|
||||||
- name: primary
|
- name: primary
|
||||||
nodes:
|
nodes:
|
||||||
|
@ -52,6 +52,18 @@
|
|||||||
dest: /etc/systemd/system/docker.service.d/http-proxy.conf
|
dest: /etc/systemd/system/docker.service.d/http-proxy.conf
|
||||||
mode: 0640
|
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
|
- name: deploy docker packages
|
||||||
when: need_docker | failed
|
when: need_docker | failed
|
||||||
include_role:
|
include_role:
|
||||||
@ -62,7 +74,7 @@
|
|||||||
deb:
|
deb:
|
||||||
- docker.io
|
- docker.io
|
||||||
rpm:
|
rpm:
|
||||||
- docker-latest
|
- docker-ce
|
||||||
|
|
||||||
- name: restarting docker
|
- name: restarting docker
|
||||||
systemd:
|
systemd:
|
||||||
|
@ -1,8 +1,8 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Docker Application Container Engine
|
Description=Docker Application Container Engine
|
||||||
Documentation=http://docs.docker.com
|
Documentation=https://docs.docker.com
|
||||||
After=network.target
|
After=network-online.target firewalld.service
|
||||||
Wants=docker-latest-storage-setup.service
|
Wants=network-online.target
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=notify
|
Type=notify
|
||||||
@ -10,13 +10,11 @@ NotifyAccess=all
|
|||||||
Environment=GOTRACEBACK=crash
|
Environment=GOTRACEBACK=crash
|
||||||
Environment=DOCKER_HTTP_HOST_COMPAT=1
|
Environment=DOCKER_HTTP_HOST_COMPAT=1
|
||||||
Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
|
Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
|
||||||
ExecStart=/usr/bin/dockerd-latest \
|
ExecStart=/usr/bin/dockerd \
|
||||||
--add-runtime docker-runc=/usr/libexec/docker/docker-runc-latest \
|
|
||||||
--default-runtime=docker-runc \
|
|
||||||
--exec-opt native.cgroupdriver=systemd \
|
--exec-opt native.cgroupdriver=systemd \
|
||||||
--userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
|
--userland-proxy-path=/usr/libexec/docker/docker-proxy \
|
||||||
-g /var/lib/docker \
|
--data-root=/var/lib/docker \
|
||||||
--storage-driver=overlay \
|
--storage-driver=overlay2 \
|
||||||
--log-driver=json-file \
|
--log-driver=json-file \
|
||||||
--iptables=false
|
--iptables=false
|
||||||
ExecReload=/bin/kill -s HUP $MAINPID
|
ExecReload=/bin/kill -s HUP $MAINPID
|
||||||
|
@ -1,20 +1,19 @@
|
|||||||
[Unit]
|
[Unit]
|
||||||
Description=Docker Application Container Engine
|
Description=Docker Application Container Engine
|
||||||
Documentation=http://docs.docker.com
|
Documentation=https://docs.docker.com
|
||||||
After=network.target docker-latest-containerd.service
|
After=network-online.target firewalld.service
|
||||||
Wants=docker-latest-storage-setup.service
|
Wants=network-online.target
|
||||||
Requires=docker-latest-containerd.service
|
|
||||||
|
|
||||||
[Service]
|
[Service]
|
||||||
Type=notify
|
Type=notify
|
||||||
Environment=GOTRACEBACK=crash
|
Environment=GOTRACEBACK=crash
|
||||||
ExecStart=/usr/bin/dockerd-latest \
|
# the default is not to use systemd for cgroups because the delegate issues still
|
||||||
--add-runtime oci=/usr/libexec/docker/docker-runc-latest \
|
# exists and systemd currently does not support the cgroup feature set required
|
||||||
--default-runtime=oci \
|
# for containers run by docker
|
||||||
--containerd /run/containerd.sock \
|
ExecStart=/usr/bin/dockerd \
|
||||||
--exec-opt native.cgroupdriver=systemd \
|
--exec-opt native.cgroupdriver=systemd \
|
||||||
--userland-proxy-path=/usr/libexec/docker/docker-proxy-latest \
|
--userland-proxy-path=/usr/libexec/docker/docker-proxy \
|
||||||
-g /var/lib/docker \
|
--data-root=/var/lib/docker \
|
||||||
--storage-driver=overlay2 \
|
--storage-driver=overlay2 \
|
||||||
--log-driver=json-file \
|
--log-driver=json-file \
|
||||||
--iptables=false
|
--iptables=false
|
||||||
|
Loading…
Reference in New Issue
Block a user