summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Gugino <mgugino@redhat.com>2017-12-05 16:48:44 -0500
committerMichael Gugino <mgugino@redhat.com>2017-12-05 16:48:44 -0500
commitfc4867523a5c050b6120428fa1df97029063da7d (patch)
treef0d7a2ca6e587a10034cb45857ca7fed0bc10f2d
parentb879f67881b1abcc8f614e1e6ca1b5cdc2cc2649 (diff)
downloadopenshift-fc4867523a5c050b6120428fa1df97029063da7d.tar.gz
openshift-fc4867523a5c050b6120428fa1df97029063da7d.tar.bz2
openshift-fc4867523a5c050b6120428fa1df97029063da7d.tar.xz
openshift-fc4867523a5c050b6120428fa1df97029063da7d.zip
Fix generate_pv_pvcs_list plugin undef
Fixes bug of referencing variable before assignment.
-rw-r--r--roles/openshift_persistent_volumes/action_plugins/generate_pv_pvcs_list.py8
1 files 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):