From fc4867523a5c050b6120428fa1df97029063da7d Mon Sep 17 00:00:00 2001 From: Michael Gugino Date: Tue, 5 Dec 2017 16:48:44 -0500 Subject: Fix generate_pv_pvcs_list plugin undef Fixes bug of referencing variable before assignment. --- .../action_plugins/generate_pv_pvcs_list.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/roles/openshift_persistent_volumes/action_plugins/generate_pv_pvcs_list.py b/roles/openshift_persistent_volumes/action_plugins/generate_pv_pvcs_list.py index 8046aff23..eb13a58ba 100644 --- a/roles/openshift_persistent_volumes/action_plugins/generate_pv_pvcs_list.py +++ b/roles/openshift_persistent_volumes/action_plugins/generate_pv_pvcs_list.py @@ -90,21 +90,19 @@ class ActionModule(ActionBase): create_pv = self.task_vars.get(str(varname) + '_create_pv') if create_pv and self._templar.template(create_pv): if kind == 'nfs': - persistent_volume = self.build_pv_nfs(varname=varname) + return self.build_pv_nfs(varname=varname) elif kind == 'openstack': - persistent_volume = self.build_pv_openstack(varname=varname) + return self.build_pv_openstack(varname=varname) elif kind == 'glusterfs': - persistent_volume = self.build_pv_glusterfs(varname=varname) + return self.build_pv_glusterfs(varname=varname) elif not (kind == 'object' or kind == 'dynamic'): msg = "|failed invalid storage kind '{0}' for component '{1}'".format( kind, varname) raise errors.AnsibleModuleError(msg) - - return persistent_volume return None def build_pvc_dict(self, varname=None): -- cgit v1.2.3