summaryrefslogtreecommitdiffstats
path: root/roles/openshift_persistent_volumes
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-06-13 21:46:15 -0400
committerGitHub <noreply@github.com>2017-06-13 21:46:15 -0400
commit85a3806b57858b35b793b8391b67f88bfeec9e10 (patch)
tree01322684429cf6d9807582b0fb0d13dafb3107b4 /roles/openshift_persistent_volumes
parent4dcd01577bc6f92ef6f1f294c4374a14e0895b96 (diff)
parent1720a5209dab342b84afd625cf609fe8fddf1f83 (diff)
downloadopenshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.gz
openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.bz2
openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.tar.xz
openshift-85a3806b57858b35b793b8391b67f88bfeec9e10.zip
Merge branch 'master' into Upgrade_Calico_Version_to_2.2.1
Diffstat (limited to 'roles/openshift_persistent_volumes')
-rw-r--r--roles/openshift_persistent_volumes/templates/persistent-volume.yml.j26
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_persistent_volumes/templates/persistent-volume.yml.j2 b/roles/openshift_persistent_volumes/templates/persistent-volume.yml.j2
index 877e88002..9c5103597 100644
--- a/roles/openshift_persistent_volumes/templates/persistent-volume.yml.j2
+++ b/roles/openshift_persistent_volumes/templates/persistent-volume.yml.j2
@@ -7,6 +7,12 @@ items:
kind: PersistentVolume
metadata:
name: "{{ volume.name }}"
+{% if volume.labels is defined and volume.labels is mapping %}
+ labels:
+{% for key,value in volume.labels.iteritems() %}
+ {{ key }}: {{ value }}
+{% endfor %}
+{% endif %}
spec:
capacity:
storage: "{{ volume.capacity }}"