From f2235be1d32b466c456eebef9bb829bffe24cce4 Mon Sep 17 00:00:00 2001
From: Jason Brooks <jbrooks@redhat.com>
Date: Mon, 16 Oct 2017 00:03:33 -0700
Subject: [PATCH] Add support for fedora atomic host (#1779)
* don't try to install this rpm on fedora atomic
* add docker 1.13.1 for fedora
* built-in docker unit file is sufficient, as tested on both fedora and centos atomic
---
roles/docker/tasks/systemd.yml | 7 ----
.../docker/templates/docker_atomic.service.j2 | 37 -------------------
roles/docker/vars/fedora.yml | 1 +
roles/kubernetes/preinstall/tasks/main.yml | 1 +
4 files changed, 2 insertions(+), 44 deletions(-)
delete mode 100644 roles/docker/templates/docker_atomic.service.j2
diff --git a/roles/docker/tasks/systemd.yml b/roles/docker/tasks/systemd.yml
index 355ee9939..86fb45d86 100644
--- a/roles/docker/tasks/systemd.yml
+++ b/roles/docker/tasks/systemd.yml
@@ -24,13 +24,6 @@
notify: restart docker
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic)
-- name: Write docker.service systemd file for atomic
- template:
- src: docker_atomic.service.j2
- dest: /etc/systemd/system/docker.service
- notify: restart docker
- when: is_atomic
-
- name: Write docker options systemd drop-in
template:
src: docker-options.conf.j2
diff --git a/roles/docker/templates/docker_atomic.service.j2 b/roles/docker/templates/docker_atomic.service.j2
deleted file mode 100644
index 0502820a0..000000000
--- a/roles/docker/templates/docker_atomic.service.j2
+++ /dev/null
@@ -1,37 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=http://docs.docker.com
-After=network.target
-Wants=docker-storage-setup.service
-
-[Service]
-Type=notify
-NotifyAccess=all
-EnvironmentFile=-/etc/sysconfig/docker
-EnvironmentFile=-/etc/sysconfig/docker-storage
-Environment=GOTRACEBACK=crash
-Environment=DOCKER_HTTP_HOST_COMPAT=1
-Environment=PATH=/usr/libexec/docker:/usr/bin:/usr/sbin
-ExecReload=/bin/kill -s HUP $MAINPID
-Delegate=yes
-KillMode=process
-ExecStart=/usr/bin/dockerd-current \
- --add-runtime docker-runc=/usr/libexec/docker/docker-runc-current \
- --default-runtime=docker-runc \
- --exec-opt native.cgroupdriver=systemd \
- --userland-proxy-path=/usr/libexec/docker/docker-proxy-current \
- $DOCKER_OPTS \
- $DOCKER_STORAGE_OPTIONS \
- $DOCKER_NETWORK_OPTIONS \
- $DOCKER_DNS_OPTIONS \
- $ADD_REGISTRY \
- $BLOCK_REGISTRY \
- $INSECURE_REGISTRY
-LimitNOFILE=1048576
-LimitNPROC=1048576
-LimitCORE=infinity
-TimeoutStartSec=1min
-Restart=on-abnormal
-
-[Install]
-WantedBy=multi-user.target
diff --git a/roles/docker/vars/fedora.yml b/roles/docker/vars/fedora.yml
index b82e5fc30..55b94e850 100644
--- a/roles/docker/vars/fedora.yml
+++ b/roles/docker/vars/fedora.yml
@@ -9,6 +9,7 @@ docker_versioned_pkg:
'latest': docker
'1.11': docker-1:1.11.2
'1.12': docker-1:1.12.5
+ '1.13': docker-1.13.1
'stable': docker-ce
'edge': docker-ce-edge
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 5554c5985..2b49b184d 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -133,6 +133,7 @@
when:
- ansible_distribution == "Fedora"
- ansible_distribution_major_version > 21
+ - not is_atomic
changed_when: False
tags:
- bootstrap-os
--
GitLab