diff options
| author | Tzu-Mainn Chen <tzumainn@redhat.com> | 2018-01-26 17:01:42 +0000 |
|---|---|---|
| committer | Tzu-Mainn Chen <tzumainn@redhat.com> | 2018-01-27 04:51:17 +0100 |
| commit | 693824ba52eca910fc6df760f7d663892bb2b31c (patch) | |
| tree | 20794ecb7d21a998e8d3c00d2b04481a70eae73c /roles | |
| parent | c6423636a4d14139960f4677dbab8fa646d1cb0c (diff) | |
| download | openshift-693824ba52eca910fc6df760f7d663892bb2b31c.tar.gz openshift-693824ba52eca910fc6df760f7d663892bb2b31c.tar.bz2 openshift-693824ba52eca910fc6df760f7d663892bb2b31c.tar.xz openshift-693824ba52eca910fc6df760f7d663892bb2b31c.zip | |
add cinder mountpoint to inventory
Diffstat (limited to 'roles')
3 files changed, 10 insertions, 0 deletions
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 |