diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-07 12:50:34 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-07 12:50:34 -0400 |
| commit | f510d55043a94f3e9ad6972a2bef3ff45662fa4a (patch) | |
| tree | ecd7e8283967acb5282f3791e1c0b88f7462edea | |
| parent | f0b8761e7d8da325f4b8fe79d52fb4f24dd950c4 (diff) | |
| parent | 7c6ae4760ca0c8ac5fcdd5bd79bd8c904d10306e (diff) | |
| download | openshift-f510d55043a94f3e9ad6972a2bef3ff45662fa4a.tar.gz openshift-f510d55043a94f3e9ad6972a2bef3ff45662fa4a.tar.bz2 openshift-f510d55043a94f3e9ad6972a2bef3ff45662fa4a.tar.xz openshift-f510d55043a94f3e9ad6972a2bef3ff45662fa4a.zip | |
Merge pull request #4370 from ashcrow/rename-daemon-json
Merged by openshift-bot
| -rw-r--r-- | roles/docker/README.md | 2 | ||||
| -rw-r--r-- | roles/docker/tasks/systemcontainer_docker.yml | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/roles/docker/README.md b/roles/docker/README.md index 4a9f21f22..19908c036 100644 --- a/roles/docker/README.md +++ b/roles/docker/README.md @@ -3,7 +3,7 @@ Docker Ensures docker package or system container is installed, and optionally raises timeout for systemd-udevd.service to 5 minutes. -daemon.json items may be found at https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file +container-daemon.json items may be found at https://docs.docker.com/engine/reference/commandline/dockerd/#daemon-configuration-file Requirements ------------ diff --git a/roles/docker/tasks/systemcontainer_docker.yml b/roles/docker/tasks/systemcontainer_docker.yml index f0f5a40dd..650f06f86 100644 --- a/roles/docker/tasks/systemcontainer_docker.yml +++ b/roles/docker/tasks/systemcontainer_docker.yml @@ -130,8 +130,8 @@ 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 -# NOTE: When jinja2.9+ is used the daemon.json file can move to using tojson +# Set local versions of facts that must be in json format for container-daemon.json +# NOTE: When jinja2.9+ is used the container-daemon.json file can move to using tojson - set_fact: l_docker_insecure_registries: "{{ docker_insecure_registries | default([]) | to_json }}" l_docker_log_options: "{{ docker_log_options | default({}) | to_json }}" @@ -139,10 +139,12 @@ l_docker_blocked_registries: "{{ docker_blocked_registries | default([]) | to_json }}" l_docker_selinux_enabled: "{{ docker_selinux_enabled | default(true) | to_json }}" -# Configure container-engine using the daemon.json file +# Configure container-engine using the container-daemon.json file +# NOTE: daemon.json and container-daemon.json have been seperated to avoid +# collision. - name: Configure Container Engine template: - dest: "{{ docker_conf_dir }}/daemon.json" + dest: "{{ docker_conf_dir }}/container-daemon.json" src: daemon.json # Enable and start the container-engine service |