summaryrefslogtreecommitdiffstats
path: root/roles/docker-storage-setup
diff options
context:
space:
mode:
authorEduardo Minguez Perez <edu@redhat.com>2017-05-16 16:21:10 +0200
committerRyan Cook <rcook@redhat.com>2017-05-16 11:04:46 -0400
commit215807f53977bc561b3791e37136f140383605ef (patch)
tree1362a97bbb861cc6b1802e970b4956d5816af8c2 /roles/docker-storage-setup
parente93b30fb20c0b13a40488b714549f3483e8b0a1d (diff)
downloadopenshift-215807f53977bc561b3791e37136f140383605ef.tar.gz
openshift-215807f53977bc561b3791e37136f140383605ef.tar.bz2
openshift-215807f53977bc561b3791e37136f140383605ef.tar.xz
openshift-215807f53977bc561b3791e37136f140383605ef.zip
Removed hardcoded values from ansible roles
Diffstat (limited to 'roles/docker-storage-setup')
-rw-r--r--roles/docker-storage-setup/defaults/main.yaml5
-rw-r--r--roles/docker-storage-setup/files/docker-storage-setup4
-rw-r--r--roles/docker-storage-setup/tasks/main.yaml4
-rw-r--r--roles/docker-storage-setup/templates/docker-storage-setup.j24
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..a5203d7e4
--- /dev/null
+++ b/roles/docker-storage-setup/templates/docker-storage-setup.j2
@@ -0,0 +1,4 @@
+DEVS="{{ docker_devs }}"
+VG="{{ docker_vg }}"
+DATA_SIZE="{{ docker_data_size }}"
+EXTRA_DOCKER_STORAGE_OPTIONS="--storage-opt dm.basesize={{ docker_dm_basesize }}"