diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-03-21 16:53:16 -0400 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-03-21 16:53:19 -0400 |
commit | ed210226e0996ebb6d31ff55185ad96357bf3014 (patch) | |
tree | 5210b0e9155c696f9c90dceb4fe5c91fd6ecf0ac /roles/lib_openshift/src/lib/volume.py | |
parent | 966ba6401443bc0e093e4b461be42473b4e16225 (diff) | |
download | openshift-ed210226e0996ebb6d31ff55185ad96357bf3014.tar.gz openshift-ed210226e0996ebb6d31ff55185ad96357bf3014.tar.bz2 openshift-ed210226e0996ebb6d31ff55185ad96357bf3014.tar.xz openshift-ed210226e0996ebb6d31ff55185ad96357bf3014.zip |
Adding configmap support and adding tests.
Diffstat (limited to 'roles/lib_openshift/src/lib/volume.py')
-rw-r--r-- | roles/lib_openshift/src/lib/volume.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/roles/lib_openshift/src/lib/volume.py b/roles/lib_openshift/src/lib/volume.py index 9e95bb3d4..b0e48523f 100644 --- a/roles/lib_openshift/src/lib/volume.py +++ b/roles/lib_openshift/src/lib/volume.py @@ -1,9 +1,8 @@ # pylint: skip-file # flake8: noqa - class Volume(object): - ''' Class to represent the volume object''' + ''' Class to represent an openshift volume object''' volume_mounts_path = {"pod": "spec.containers[0].volumeMounts", "dc": "spec.template.spec.containers[0].volumeMounts", "rc": "spec.template.spec.containers[0].volumeMounts", @@ -18,23 +17,27 @@ class Volume(object): ''' return a properly structured volume ''' volume_mount = None volume = {'name': volume_info['name']} - if volume_info['type'] == 'secret': + volume_type = volume_info['type'].lower() + if volume_type == 'secret': volume['secret'] = {} volume[volume_info['type']] = {'secretName': volume_info['secret_name']} volume_mount = {'mountPath': volume_info['path'], 'name': volume_info['name']} - elif volume_info['type'] == 'emptydir': + elif volume_type == 'emptydir': volume['emptyDir'] = {} volume_mount = {'mountPath': volume_info['path'], 'name': volume_info['name']} - elif volume_info['type'] == 'pvc': + elif volume_type == 'pvc' or volume_type == 'persistentvolumeclaim': volume['persistentVolumeClaim'] = {} volume['persistentVolumeClaim']['claimName'] = volume_info['claimName'] volume['persistentVolumeClaim']['claimSize'] = volume_info['claimSize'] - volume_mount = {'mountPath': volume_info['path'], - 'name': volume_info['name']} - elif volume_info['type'] == 'hostpath': + elif volume_type == 'hostpath': volume['hostPath'] = {} volume['hostPath']['path'] = volume_info['path'] + elif volume_type == 'configmap': + volume['configMap'] = {} + volume['configMap']['name'] = volume_info['name'] + volume_mount = {'mountPath': volume_info['path'], + 'name': volume_info['name']} return (volume, volume_mount) |