summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteve Milner <smilner@redhat.com>2017-05-12 11:15:53 -0400
committerSteve Milner <smilner@redhat.com>2017-05-12 11:15:53 -0400
commit10ebc8c3ca7b37ddd185628c2f2632b39d6864f5 (patch)
tree32dde79161c86312182035de9283c44734aab961
parentd1d60e24b54ca6ba0dc98e8b0b2ea4cfa8b92830 (diff)
downloadopenshift-10ebc8c3ca7b37ddd185628c2f2632b39d6864f5.tar.gz
openshift-10ebc8c3ca7b37ddd185628c2f2632b39d6864f5.tar.bz2
openshift-10ebc8c3ca7b37ddd185628c2f2632b39d6864f5.tar.xz
openshift-10ebc8c3ca7b37ddd185628c2f2632b39d6864f5.zip
Move container-engine systemd environment to updated location
-rw-r--r--roles/docker/tasks/systemcontainer_docker.yml4
-rw-r--r--roles/docker/vars/main.yml1
2 files changed, 3 insertions, 2 deletions
diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml
index a461c479a..7f2ce14d1 100644
--- a/roles/docker/tasks/systemcontainer_docker.yml
+++ b/roles/docker/tasks/systemcontainer_docker.yml
@@ -93,7 +93,7 @@
- name: Ensure docker.service.d directory exists
file:
- path: "{{ docker_systemd_dir }}"
+ path: "{{ container_engine_systemd_dir }}"
state: directory
- name: Ensure /etc/docker directory exists
@@ -111,7 +111,7 @@
- name: Configure Container Engine Service File
template:
- dest: "{{ docker_systemd_dir }}/custom.conf"
+ dest: "{{ container_engine_systemd_dir }}/custom.conf"
src: systemcontainercustom.conf.j2
# Set local versions of facts that must be in json format for daemon.json
diff --git a/roles/docker/vars/main.yml b/roles/docker/vars/main.yml
index 0082ded1e..4e940b7f5 100644
--- a/roles/docker/vars/main.yml
+++ b/roles/docker/vars/main.yml
@@ -1,4 +1,5 @@
---
docker_systemd_dir: /etc/systemd/system/docker.service.d
+container_engine_systemd_dir: /etc/systemd/system/container-engine.service.d
docker_conf_dir: /etc/docker/
udevw_udevd_dir: /etc/systemd/system/systemd-udevd.service.d