diff options
author | Kenny Woodson <kwoodson@redhat.com> | 2017-03-15 17:41:32 -0400 |
---|---|---|
committer | Kenny Woodson <kwoodson@redhat.com> | 2017-03-21 16:53:19 -0400 |
commit | 966ba6401443bc0e093e4b461be42473b4e16225 (patch) | |
tree | d1a5b1ba888967e50bfdf6528a2f10770c691f7e /roles/lib_openshift/library/oc_adm_registry.py | |
parent | 2ac2c5c4fcc260d5e59c524d54879f9717ac9fa6 (diff) | |
download | openshift-966ba6401443bc0e093e4b461be42473b4e16225.tar.gz openshift-966ba6401443bc0e093e4b461be42473b4e16225.tar.bz2 openshift-966ba6401443bc0e093e4b461be42473b4e16225.tar.xz openshift-966ba6401443bc0e093e4b461be42473b4e16225.zip |
Adding oc_volume to lib_openshift.
Diffstat (limited to 'roles/lib_openshift/library/oc_adm_registry.py')
-rw-r--r-- | roles/lib_openshift/library/oc_adm_registry.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/roles/lib_openshift/library/oc_adm_registry.py b/roles/lib_openshift/library/oc_adm_registry.py index 93cf34559..bbbe8652f 100644 --- a/roles/lib_openshift/library/oc_adm_registry.py +++ b/roles/lib_openshift/library/oc_adm_registry.py @@ -2060,8 +2060,9 @@ class Service(Yedit): # -*- -*- -*- Begin included fragment: lib/volume.py -*- -*- -*- + class Volume(object): - ''' Class to model an openshift volume object''' + ''' Class to represent the volume object''' volume_mounts_path = {"pod": "spec.containers[0].volumeMounts", "dc": "spec.template.spec.containers[0].volumeMounts", "rc": "spec.template.spec.containers[0].volumeMounts", @@ -2076,21 +2077,22 @@ class Volume(object): ''' return a properly structured volume ''' volume_mount = None volume = {'name': volume_info['name']} - volume_type = volume_info['type'].lower() - if volume_type == 'secret': + if volume_info['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_type == 'emptydir': + elif volume_info['type'] == 'emptydir': volume['emptyDir'] = {} volume_mount = {'mountPath': volume_info['path'], 'name': volume_info['name']} - elif volume_type == 'pvc' or volume_type == 'persistentvolumeclaim': + elif volume_info['type'] == 'pvc': volume['persistentVolumeClaim'] = {} volume['persistentVolumeClaim']['claimName'] = volume_info['claimName'] volume['persistentVolumeClaim']['claimSize'] = volume_info['claimSize'] - elif volume_type == 'hostpath': + volume_mount = {'mountPath': volume_info['path'], + 'name': volume_info['name']} + elif volume_info['type'] == 'hostpath': volume['hostPath'] = {} volume['hostPath']['path'] = volume_info['path'] |