From 215807f53977bc561b3791e37136f140383605ef Mon Sep 17 00:00:00 2001 From: Eduardo Minguez Perez Date: Tue, 16 May 2017 16:21:10 +0200 Subject: Removed hardcoded values from ansible roles --- roles/docker-storage-setup/defaults/main.yaml | 5 +++++ roles/docker-storage-setup/files/docker-storage-setup | 4 ---- roles/docker-storage-setup/tasks/main.yaml | 4 ++-- roles/docker-storage-setup/templates/docker-storage-setup.j2 | 4 ++++ 4 files changed, 11 insertions(+), 6 deletions(-) create mode 100644 roles/docker-storage-setup/defaults/main.yaml delete mode 100644 roles/docker-storage-setup/files/docker-storage-setup create mode 100644 roles/docker-storage-setup/templates/docker-storage-setup.j2 (limited to 'roles/docker-storage-setup') 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 }}" -- cgit v1.2.3 From c9305e842efb4098477e249d2bea87a73a989f0c Mon Sep 17 00:00:00 2001 From: Peter Schiffer Date: Thu, 18 May 2017 19:14:11 +0200 Subject: More ansible migration and deploy OCP from local workstation (#376) * Create registry bucket with deployment manager * Migrate ssh proxy to Ansible * Update gce dynamic inventory script, use instance name for ssh * Fix variable name in docker storage setup role * Deploy OCP from local workstation, and not from the bastion host --- roles/docker-storage-setup/templates/docker-storage-setup.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'roles/docker-storage-setup') diff --git a/roles/docker-storage-setup/templates/docker-storage-setup.j2 b/roles/docker-storage-setup/templates/docker-storage-setup.j2 index a5203d7e4..b5869feff 100644 --- a/roles/docker-storage-setup/templates/docker-storage-setup.j2 +++ b/roles/docker-storage-setup/templates/docker-storage-setup.j2 @@ -1,4 +1,4 @@ -DEVS="{{ docker_devs }}" +DEVS="{{ docker_dev }}" VG="{{ docker_vg }}" DATA_SIZE="{{ docker_data_size }}" EXTRA_DOCKER_STORAGE_OPTIONS="--storage-opt dm.basesize={{ docker_dm_basesize }}" -- cgit v1.2.3