diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2017-11-06 13:38:32 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-11-06 13:38:32 -0800 |
commit | bad24df56bfc7354d143a4b056bf7741688de03b (patch) | |
tree | 8893d4afe6f1064363b4a95d2f9253db684009b2 /roles/docker/defaults | |
parent | b1c349dfd774199125033d76a31a90daa09a8a9c (diff) | |
parent | 6d7bccdb0e8572ced06929de592ed72f7db41fc6 (diff) | |
download | openshift-bad24df56bfc7354d143a4b056bf7741688de03b.tar.gz openshift-bad24df56bfc7354d143a4b056bf7741688de03b.tar.bz2 openshift-bad24df56bfc7354d143a4b056bf7741688de03b.tar.xz openshift-bad24df56bfc7354d143a4b056bf7741688de03b.zip |
Merge pull request #6007 from kwoodson/container_location
Automatic merge from submit-queue.
Moving docker location to share path with system containers.
Diffstat (limited to 'roles/docker/defaults')
-rw-r--r-- | roles/docker/defaults/main.yml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index f6f2bd77e..c086c28df 100644 --- a/roles/docker/defaults/main.yml +++ b/roles/docker/defaults/main.yml @@ -33,3 +33,6 @@ r_crio_os_firewall_allow: openshift_docker_is_node_or_master: "{{ True if inventory_hostname in (groups['oo_masters_to_config']|default([])) or inventory_hostname in (groups['oo_nodes_to_config']|default([])) else False | bool }}" + +docker_alt_storage_path: /var/lib/containers/docker +docker_default_storage_path: /var/lib/docker |