diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-06-13 16:02:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-13 16:02:18 -0400 |
| commit | 3fed1873230d9e84c07824b7de98ae7edfc481ba (patch) | |
| tree | e97d2dae693b22f30976e5804bdd02cc591cc84b /filter_plugins | |
| parent | 75a46c184bda80158c085bcd38b40fd4d02aabd0 (diff) | |
| parent | ee59257a018f081efa1f121cba40f857e07e9ef5 (diff) | |
| download | openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.gz openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.bz2 openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.tar.xz openshift-3fed1873230d9e84c07824b7de98ae7edfc481ba.zip | |
Merge pull request #4302 from ewolinetz/pv_node_selectors
Merged by openshift-bot
Diffstat (limited to 'filter_plugins')
| -rw-r--r-- | filter_plugins/oo_filters.py | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 8b279981d..cff9f8a60 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -715,7 +715,7 @@ def oo_openshift_env(hostvars): return facts -# pylint: disable=too-many-branches, too-many-nested-blocks +# pylint: disable=too-many-branches, too-many-nested-blocks, too-many-statements def oo_persistent_volumes(hostvars, groups, persistent_volumes=None): """ Generate list of persistent volumes based on oo_openshift_env storage options set in host variables. @@ -747,10 +747,15 @@ def oo_persistent_volumes(hostvars, groups, persistent_volumes=None): volume = params['volume']['name'] path = directory + '/' + volume size = params['volume']['size'] + if 'labels' in params: + labels = params['labels'] + else: + labels = dict() access_modes = params['access']['modes'] persistent_volume = dict( name="{0}-volume".format(volume), capacity=size, + labels=labels, access_modes=access_modes, storage=dict( nfs=dict( @@ -760,12 +765,17 @@ def oo_persistent_volumes(hostvars, groups, persistent_volumes=None): elif kind == 'openstack': volume = params['volume']['name'] size = params['volume']['size'] + if 'labels' in params: + labels = params['labels'] + else: + labels = dict() access_modes = params['access']['modes'] filesystem = params['openstack']['filesystem'] volume_id = params['openstack']['volumeID'] persistent_volume = dict( name="{0}-volume".format(volume), capacity=size, + labels=labels, access_modes=access_modes, storage=dict( cinder=dict( @@ -775,6 +785,10 @@ def oo_persistent_volumes(hostvars, groups, persistent_volumes=None): elif kind == 'glusterfs': volume = params['volume']['name'] size = params['volume']['size'] + if 'labels' in params: + labels = params['labels'] + else: + labels = dict() access_modes = params['access']['modes'] endpoints = params['glusterfs']['endpoints'] path = params['glusterfs']['path'] @@ -782,6 +796,7 @@ def oo_persistent_volumes(hostvars, groups, persistent_volumes=None): persistent_volume = dict( name="{0}-volume".format(volume), capacity=size, + labels=labels, access_modes=access_modes, storage=dict( glusterfs=dict( |