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 ++++ roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 | 4 ++++ roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | 2 ++ 3 files changed, 10 insertions(+) (limited to 'roles') 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 }}" diff --git a/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 b/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 index 1bf366bdc..19beba09e 100644 --- a/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 +++ b/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.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 }}" STORAGE_DRIVER=overlay2 diff --git a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 index 29b09f3c9..32f018814 100644 --- a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 @@ -261,6 +261,8 @@ resources: properties: size: { get_param: volume_size } availability_zone: { get_param: availability_zone } + metadata: + purpose: openshift_docker_storage volume_attachment: type: OS::Cinder::VolumeAttachment -- cgit v1.2.1 From 2919da2f40f9e8e83768c2b5223a6dad12fdf290 Mon Sep 17 00:00:00 2001 From: Tzu-Mainn Chen Date: Mon, 29 Jan 2018 17:21:35 +0100 Subject: remove mountpoint parameter --- roles/openshift_openstack/templates/heat_stack_server.yaml.j2 | 1 - 1 file changed, 1 deletion(-) (limited to 'roles') diff --git a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 index 32f018814..9aeecfa74 100644 --- a/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 +++ b/roles/openshift_openstack/templates/heat_stack_server.yaml.j2 @@ -269,5 +269,4 @@ resources: properties: volume_id: { get_resource: cinder_volume } instance_uuid: { get_resource: server } - mountpoint: /dev/sdb {% endif %} -- cgit v1.2.1 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 ++-- roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'roles') 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 %} diff --git a/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 b/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 index 19beba09e..917347073 100644 --- a/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.j2 +++ b/roles/openshift_openstack/templates/docker-storage-setup-overlayfs.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.1