diff options
| author |   Volodymyr Mytnyk <volodymyrx.mytnyk@intel.com> | 2019-04-10 13:08:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2019-04-10 13:08:31 +0000 |
| commit | 441c147b14aae5ed6181d024b6f9ff370d9286c3 (patch) | |
| tree | 9088af6f995b5ec18efe1150b9671d3229d56c55 /ansible/roles/docker | |
| parent | 493aef0c5a6cd1c5ac4f73af8c4a0ab55bb17ab0 (diff) | |
| parent | c7ebf51b203aa39ca0aa63f9abfa00e4e1ba4521 (diff) | |
Merge "Revert "Add ansible scripts to deploy Kubernetes""
Diffstat (limited to 'ansible/roles/docker')
| -rw-r--r-- | ansible/roles/docker/tasks/main.yml | 6 | ||||
| -rw-r--r-- | ansible/roles/docker/templates/daemon.json.j2 | 1 |
2 files changed, 1 insertions, 6 deletions
diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 18e441462..bbec371a8 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -1,4 +1,4 @@ -# Copyright (c) 2017-2019 Intel Corporation. +# Copyright (c) 2017 Intel Corporation. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -18,10 +18,6 @@ - name: create docker service config dir file: path=/etc/systemd/system/docker.service.d state=directory - - name: docker configuration - template: src=daemon.json.j2 dest=/etc/docker/daemon.json owner=root mode=0644 - when: 'docker_daemon_config is defined' - - name: create docker proxy config template: src=http-proxy-conf.j2 dest=/etc/systemd/system/docker.service.d/http-proxy.conf owner=root mode=0644 when: 'proxy_env is defined and "http_proxy" in proxy_env or "https_proxy" in proxy_env' diff --git a/ansible/roles/docker/templates/daemon.json.j2 b/ansible/roles/docker/templates/daemon.json.j2 deleted file mode 100644 index 57bdc9f63..000000000 --- a/ansible/roles/docker/templates/daemon.json.j2 +++ /dev/null @@ -1 +0,0 @@ -{{ docker_daemon_config | to_nice_json }} |