diff options
| author | Ryan Cook <rcook@redhat.com> | 2017-05-24 14:03:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-24 14:03:42 -0400 |
| commit | 3b09f193b760e842e592b661aadbd2dd8365bb90 (patch) | |
| tree | d96d9d6f202955cf980b043376eeedb36482ebc9 | |
| parent | 5cc3a3b8dffe8846c680963da2cf21a0fc021cf9 (diff) | |
| parent | a70056cd8de3cf52c49fd8ccdce9dcddf52ac0c2 (diff) | |
| download | openshift-3b09f193b760e842e592b661aadbd2dd8365bb90.tar.gz openshift-3b09f193b760e842e592b661aadbd2dd8365bb90.tar.bz2 openshift-3b09f193b760e842e592b661aadbd2dd8365bb90.tar.xz openshift-3b09f193b760e842e592b661aadbd2dd8365bb90.zip | |
Merge branch 'master' into resize_masters
4 files changed, 11 insertions, 6 deletions
diff --git a/roles/docker-storage-setup/defaults/main.yaml b/roles/docker-storage-setup/defaults/main.yaml new file mode 100644 index 000000000..e36f1b85a --- /dev/null +++ b/roles/docker-storage-setup/defaults/main.yaml @@ -0,0 +1,5 @@ +--- +docker_dev: "/dev/sdb" +docker_vg: "docker-vol" +docker_data_size: "95%VG" +docker_dm_basesize: "3G" diff --git a/roles/docker-storage-setup/files/docker-storage-setup b/roles/docker-storage-setup/files/docker-storage-setup deleted file mode 100644 index 5e9d494a1..000000000 --- a/roles/docker-storage-setup/files/docker-storage-setup +++ /dev/null @@ -1,4 +0,0 @@ -DEVS=/dev/sdb -VG=docker-vol -DATA_SIZE=95%VG -EXTRA_DOCKER_STORAGE_OPTIONS="--storage-opt dm.basesize=3G" diff --git a/roles/docker-storage-setup/tasks/main.yaml b/roles/docker-storage-setup/tasks/main.yaml index 17b13f27f..7202bc46b 100644 --- a/roles/docker-storage-setup/tasks/main.yaml +++ b/roles/docker-storage-setup/tasks/main.yaml @@ -1,7 +1,7 @@ --- - name: create the docker-storage-setup config file - copy: - src: docker-storage-setup + template: + src: "{{ role_path }}/templates/docker-storage-setup.j2" dest: /etc/sysconfig/docker-storage-setup owner: root group: root diff --git a/roles/docker-storage-setup/templates/docker-storage-setup.j2 b/roles/docker-storage-setup/templates/docker-storage-setup.j2 new file mode 100644 index 000000000..b5869feff --- /dev/null +++ b/roles/docker-storage-setup/templates/docker-storage-setup.j2 @@ -0,0 +1,4 @@ +DEVS="{{ docker_dev }}" +VG="{{ docker_vg }}" +DATA_SIZE="{{ docker_data_size }}" +EXTRA_DOCKER_STORAGE_OPTIONS="--storage-opt dm.basesize={{ docker_dm_basesize }}" |