Przeglądaj źródła

Fix access_modes initialization

Luis Fernandez Alvarez 8 lat temu
rodzic
commit
8fc936578f

+ 3 - 3
filter_plugins/oo_filters.py

@@ -708,7 +708,7 @@ class FilterModule(object):
                             volume = params['volume']['name']
                             path = directory + '/' + volume
                             size = params['volume']['size']
-                            access_modes = params['access_modes']
+                            access_modes = params['access']['modes']
                             persistent_volume = dict(
                                 name="{0}-volume".format(volume),
                                 capacity=size,
@@ -721,7 +721,7 @@ class FilterModule(object):
                         elif kind == 'openstack':
                             volume = params['volume']['name']
                             size = params['volume']['size']
-                            access_modes = params['access_modes']
+                            access_modes = params['access']['modes']
                             filesystem = params['openstack']['filesystem']
                             volume_id = params['openstack']['volumeID']
                             persistent_volume = dict(
@@ -762,7 +762,7 @@ class FilterModule(object):
                     if kind not in [None, 'object'] and create_pv and create_pvc:
                         volume = params['volume']['name']
                         size = params['volume']['size']
-                        access_modes = params['access_modes']
+                        access_modes = params['access']['modes']
                         persistent_volume_claim = dict(
                             name="{0}-claim".format(volume),
                             capacity=size,

+ 9 - 3
roles/openshift_facts/library/openshift_facts.py

@@ -1994,7 +1994,9 @@ class OpenShiftFacts(object):
                             options='*(rw,root_squash)'
                         ),
                         host=None,
-                        access_modes=['ReadWriteOnce'],
+                        access=dict(
+                            modes=['ReadWriteOnce']
+                        ),
                         create_pv=True,
                         create_pvc=False
                     )
@@ -2011,7 +2013,9 @@ class OpenShiftFacts(object):
                             options='*(rw,root_squash)'
                         ),
                         host=None,
-                        access_modes=['ReadWriteOnce'],
+                        access=dict(
+                            modes=['ReadWriteOnce']
+                        ),
                         create_pv=True,
                         create_pvc=False
                     )
@@ -2027,7 +2031,9 @@ class OpenShiftFacts(object):
                             directory='/exports',
                             options='*(rw,root_squash)'),
                         host=None,
-                        access_modes=['ReadWriteMany'],
+                        access=dict(
+                            modes=['ReadWriteMany']
+                        ),
                         create_pv=True,
                         create_pvc=True
                     )