diff options
| author | Kenny Woodson <kwoodson@redhat.com> | 2018-01-25 19:46:25 -0500 |
|---|---|---|
| committer | Kenny Woodson <kwoodson@redhat.com> | 2018-01-25 20:52:53 -0500 |
| commit | bf443f65b0158b4d32b631775b26d6e2ce067b95 (patch) | |
| tree | 59b075c058ee4e6f10eae60376522b69c96b73ca | |
| parent | 962f186bcf0ffa56d1dacfbbfe79e6d76d6e8bbd (diff) | |
| download | openshift-bf443f65b0158b4d32b631775b26d6e2ce067b95.tar.gz openshift-bf443f65b0158b4d32b631775b26d6e2ce067b95.tar.bz2 openshift-bf443f65b0158b4d32b631775b26d6e2ce067b95.tar.xz openshift-bf443f65b0158b4d32b631775b26d6e2ce067b95.zip | |
Removing dependency on the extra stroage device.
| -rw-r--r-- | roles/container_runtime/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/container_runtime/templates/docker_storage_setup.j2 | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/roles/container_runtime/defaults/main.yml b/roles/container_runtime/defaults/main.yml index 8203d15f5..7ca3ed96f 100644 --- a/roles/container_runtime/defaults/main.yml +++ b/roles/container_runtime/defaults/main.yml @@ -64,7 +64,7 @@ docker_storage_setup_options: root_lv_mount_path: "{{ docker_storage_path }}" docker_storage_extra_options: - "--storage-opt overlay2.override_kernel_check=true" -- "--storage-opt overlay2.size={{ docker_storage_size }}" +- "{{ '--storage-opt overlay2.size=' ~ docker_storage_size if container_runtime_docker_storage_setup_device is defined and container_runtime_docker_storage_setup_device != '' else '' }}" - "--graph={{ docker_storage_path}}" diff --git a/roles/container_runtime/templates/docker_storage_setup.j2 b/roles/container_runtime/templates/docker_storage_setup.j2 index b056087e0..ec540ea44 100644 --- a/roles/container_runtime/templates/docker_storage_setup.j2 +++ b/roles/container_runtime/templates/docker_storage_setup.j2 @@ -2,6 +2,7 @@ # /usr/lib/docker-storage-setup/docker-storage-setup. # # For more details refer to "man docker-storage-setup" +{% if container_runtime_docker_storage_setup_device is defined and container_runtime_docker_storage_setup_device != '' %} DEVS={{ container_runtime_docker_storage_setup_device }} VG={{ docker_storage_setup_options.vg }} DATA_SIZE={{ docker_storage_setup_options.data_size }} @@ -9,4 +10,7 @@ STORAGE_DRIVER="{{ docker_storage_setup_options.storage_driver }}" CONTAINER_ROOT_LV_NAME="{{ docker_storage_setup_options.root_lv_name }}" CONTAINER_ROOT_LV_SIZE="{{ docker_storage_setup_options.root_lv_size }}" CONTAINER_ROOT_LV_MOUNT_PATH="{{ docker_storage_setup_options.root_lv_mount_path }}" +{% else %} +STORAGE_DRIVER="{{ docker_storage_setup_options.storage_driver }}" +{% endif %} EXTRA_STORAGE_OPTIONS="{{ docker_storage_extra_options | join(' ') }}" |