diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-05-24 11:10:00 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-05-26 17:21:50 -0500 |
| commit | 44227c5bf81d6e95882ed96179eebc5d7900d423 (patch) | |
| tree | 7dd7cea85b6defbc82b773fc09f38ced9a76237e /filter_plugins | |
| parent | 8c57b7f62f6351d03c1e28d7cff88279fc16f88a (diff) | |
| download | openshift-44227c5bf81d6e95882ed96179eebc5d7900d423.tar.gz openshift-44227c5bf81d6e95882ed96179eebc5d7900d423.tar.bz2 openshift-44227c5bf81d6e95882ed96179eebc5d7900d423.tar.xz openshift-44227c5bf81d6e95882ed96179eebc5d7900d423.zip | |
Allowing openshift_metrics to specify PV selectors and allow way to define selectors when creating pv
Diffstat (limited to 'filter_plugins')
| -rw-r--r-- | filter_plugins/oo_filters.py | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/filter_plugins/oo_filters.py b/filter_plugins/oo_filters.py index 8b279981d..ed5d71ebd 100644 --- a/filter_plugins/oo_filters.py +++ b/filter_plugins/oo_filters.py @@ -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( |