From 693824ba52eca910fc6df760f7d663892bb2b31c Mon Sep 17 00:00:00 2001 From: Tzu-Mainn Chen Date: Fri, 26 Jan 2018 17:01:42 +0000 Subject: add cinder mountpoint to inventory --- roles/openshift_openstack/templates/docker-storage-setup-dm.j2 | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'roles/openshift_openstack/templates/docker-storage-setup-dm.j2') diff --git a/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 b/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 index 32c6b5838..eeed750cf 100644 --- a/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 +++ b/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 @@ -1,4 +1,8 @@ +{% if docker_storage_volume_mountpoints is defined %} +DEVS="{{ docker_storage_volume_mountpoints }}" +{% else %} DEVS="{{ openshift_openstack_container_storage_setup.docker_dev }}" +{% endif %} VG="{{ openshift_openstack_container_storage_setup.docker_vg }}" DATA_SIZE="{{ openshift_openstack_container_storage_setup.docker_data_size }}" EXTRA_DOCKER_STORAGE_OPTIONS="--storage-opt dm.basesize={{ openshift_openstack_container_storage_setup.docker_dm_basesize }}" -- cgit v1.2.3 From 9ceadb2718e714cba7126a4a575123a42157f103 Mon Sep 17 00:00:00 2001 From: Tzu-Mainn Chen Date: Mon, 29 Jan 2018 17:21:46 +0100 Subject: fix hostvars parameter name --- roles/openshift_openstack/templates/docker-storage-setup-dm.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'roles/openshift_openstack/templates/docker-storage-setup-dm.j2') diff --git a/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 b/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 index eeed750cf..9015c561f 100644 --- a/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 +++ b/roles/openshift_openstack/templates/docker-storage-setup-dm.j2 @@ -1,5 +1,5 @@ -{% if docker_storage_volume_mountpoints is defined %} -DEVS="{{ docker_storage_volume_mountpoints }}" +{% if docker_storage_mountpoints is defined %} +DEVS="{{ docker_storage_mountpoints }}" {% else %} DEVS="{{ openshift_openstack_container_storage_setup.docker_dev }}" {% endif %} -- cgit v1.2.3