From 2d48094b2a731519a00794822c17a313e4d45d42 Mon Sep 17 00:00:00 2001
From: "Jose A. Rivera" <jarrpa@redhat.com>
Date: Fri, 29 Sep 2017 17:40:00 -0500
Subject: lib/base: Allow for empty option value

Signed-off-by: Jose A. Rivera <jarrpa@redhat.com>
---
 roles/lib_openshift/library/oc_adm_ca_server_cert.py    | 2 +-
 roles/lib_openshift/library/oc_adm_csr.py               | 2 +-
 roles/lib_openshift/library/oc_adm_manage_node.py       | 2 +-
 roles/lib_openshift/library/oc_adm_policy_group.py      | 2 +-
 roles/lib_openshift/library/oc_adm_policy_user.py       | 2 +-
 roles/lib_openshift/library/oc_adm_registry.py          | 2 +-
 roles/lib_openshift/library/oc_adm_router.py            | 2 +-
 roles/lib_openshift/library/oc_clusterrole.py           | 2 +-
 roles/lib_openshift/library/oc_configmap.py             | 2 +-
 roles/lib_openshift/library/oc_edit.py                  | 2 +-
 roles/lib_openshift/library/oc_env.py                   | 2 +-
 roles/lib_openshift/library/oc_group.py                 | 2 +-
 roles/lib_openshift/library/oc_image.py                 | 2 +-
 roles/lib_openshift/library/oc_label.py                 | 2 +-
 roles/lib_openshift/library/oc_obj.py                   | 2 +-
 roles/lib_openshift/library/oc_objectvalidator.py       | 2 +-
 roles/lib_openshift/library/oc_process.py               | 2 +-
 roles/lib_openshift/library/oc_project.py               | 2 +-
 roles/lib_openshift/library/oc_pvc.py                   | 2 +-
 roles/lib_openshift/library/oc_route.py                 | 2 +-
 roles/lib_openshift/library/oc_scale.py                 | 2 +-
 roles/lib_openshift/library/oc_secret.py                | 2 +-
 roles/lib_openshift/library/oc_service.py               | 2 +-
 roles/lib_openshift/library/oc_serviceaccount.py        | 2 +-
 roles/lib_openshift/library/oc_serviceaccount_secret.py | 2 +-
 roles/lib_openshift/library/oc_storageclass.py          | 2 +-
 roles/lib_openshift/library/oc_user.py                  | 2 +-
 roles/lib_openshift/library/oc_version.py               | 2 +-
 roles/lib_openshift/library/oc_volume.py                | 2 +-
 29 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'roles/lib_openshift/library')

diff --git a/roles/lib_openshift/library/oc_adm_ca_server_cert.py b/roles/lib_openshift/library/oc_adm_ca_server_cert.py
index 1e6eb2386..05b2763d5 100644
--- a/roles/lib_openshift/library/oc_adm_ca_server_cert.py
+++ b/roles/lib_openshift/library/oc_adm_ca_server_cert.py
@@ -1421,7 +1421,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_adm_csr.py b/roles/lib_openshift/library/oc_adm_csr.py
index 8c6a81cc8..d1dc4caf8 100644
--- a/roles/lib_openshift/library/oc_adm_csr.py
+++ b/roles/lib_openshift/library/oc_adm_csr.py
@@ -1399,7 +1399,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_adm_manage_node.py b/roles/lib_openshift/library/oc_adm_manage_node.py
index 4a7847e88..152f270ab 100644
--- a/roles/lib_openshift/library/oc_adm_manage_node.py
+++ b/roles/lib_openshift/library/oc_adm_manage_node.py
@@ -1407,7 +1407,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_adm_policy_group.py b/roles/lib_openshift/library/oc_adm_policy_group.py
index b8af5cad9..3082f5890 100644
--- a/roles/lib_openshift/library/oc_adm_policy_group.py
+++ b/roles/lib_openshift/library/oc_adm_policy_group.py
@@ -1393,7 +1393,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_adm_policy_user.py b/roles/lib_openshift/library/oc_adm_policy_user.py
index 3364f8de3..1ceaf5d0d 100644
--- a/roles/lib_openshift/library/oc_adm_policy_user.py
+++ b/roles/lib_openshift/library/oc_adm_policy_user.py
@@ -1393,7 +1393,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_adm_registry.py b/roles/lib_openshift/library/oc_adm_registry.py
index c64d7ffd2..5d6fa1f80 100644
--- a/roles/lib_openshift/library/oc_adm_registry.py
+++ b/roles/lib_openshift/library/oc_adm_registry.py
@@ -1511,7 +1511,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_adm_router.py b/roles/lib_openshift/library/oc_adm_router.py
index 492494bda..ffea14766 100644
--- a/roles/lib_openshift/library/oc_adm_router.py
+++ b/roles/lib_openshift/library/oc_adm_router.py
@@ -1536,7 +1536,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_clusterrole.py b/roles/lib_openshift/library/oc_clusterrole.py
index b412ca8af..9761b4b4e 100644
--- a/roles/lib_openshift/library/oc_clusterrole.py
+++ b/roles/lib_openshift/library/oc_clusterrole.py
@@ -1385,7 +1385,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_configmap.py b/roles/lib_openshift/library/oc_configmap.py
index 8bbc22c49..047edffbb 100644
--- a/roles/lib_openshift/library/oc_configmap.py
+++ b/roles/lib_openshift/library/oc_configmap.py
@@ -1391,7 +1391,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_edit.py b/roles/lib_openshift/library/oc_edit.py
index ad17051cb..0b6a8436b 100644
--- a/roles/lib_openshift/library/oc_edit.py
+++ b/roles/lib_openshift/library/oc_edit.py
@@ -1435,7 +1435,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_env.py b/roles/lib_openshift/library/oc_env.py
index 74a84ac89..1f52fba40 100644
--- a/roles/lib_openshift/library/oc_env.py
+++ b/roles/lib_openshift/library/oc_env.py
@@ -1402,7 +1402,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_group.py b/roles/lib_openshift/library/oc_group.py
index eea1516ae..1b63a6c13 100644
--- a/roles/lib_openshift/library/oc_group.py
+++ b/roles/lib_openshift/library/oc_group.py
@@ -1375,7 +1375,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_image.py b/roles/lib_openshift/library/oc_image.py
index dc33d3b8a..94b08d9ce 100644
--- a/roles/lib_openshift/library/oc_image.py
+++ b/roles/lib_openshift/library/oc_image.py
@@ -1394,7 +1394,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_label.py b/roles/lib_openshift/library/oc_label.py
index 88fd9554d..ad837fdb5 100644
--- a/roles/lib_openshift/library/oc_label.py
+++ b/roles/lib_openshift/library/oc_label.py
@@ -1411,7 +1411,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_obj.py b/roles/lib_openshift/library/oc_obj.py
index 8408f9ebc..892546e56 100644
--- a/roles/lib_openshift/library/oc_obj.py
+++ b/roles/lib_openshift/library/oc_obj.py
@@ -1414,7 +1414,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_objectvalidator.py b/roles/lib_openshift/library/oc_objectvalidator.py
index d1be0b534..38df585f0 100644
--- a/roles/lib_openshift/library/oc_objectvalidator.py
+++ b/roles/lib_openshift/library/oc_objectvalidator.py
@@ -1346,7 +1346,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_process.py b/roles/lib_openshift/library/oc_process.py
index 9a281e6cd..70632f86d 100644
--- a/roles/lib_openshift/library/oc_process.py
+++ b/roles/lib_openshift/library/oc_process.py
@@ -1403,7 +1403,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_project.py b/roles/lib_openshift/library/oc_project.py
index b503c330b..4eee748d7 100644
--- a/roles/lib_openshift/library/oc_project.py
+++ b/roles/lib_openshift/library/oc_project.py
@@ -1400,7 +1400,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_pvc.py b/roles/lib_openshift/library/oc_pvc.py
index 7a9e3bf89..2e73a7645 100644
--- a/roles/lib_openshift/library/oc_pvc.py
+++ b/roles/lib_openshift/library/oc_pvc.py
@@ -1407,7 +1407,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_route.py b/roles/lib_openshift/library/oc_route.py
index 875e473ad..b46fd5495 100644
--- a/roles/lib_openshift/library/oc_route.py
+++ b/roles/lib_openshift/library/oc_route.py
@@ -1445,7 +1445,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_scale.py b/roles/lib_openshift/library/oc_scale.py
index ec3635753..c142f1f43 100644
--- a/roles/lib_openshift/library/oc_scale.py
+++ b/roles/lib_openshift/library/oc_scale.py
@@ -1389,7 +1389,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_secret.py b/roles/lib_openshift/library/oc_secret.py
index c010607e8..19c7fde78 100644
--- a/roles/lib_openshift/library/oc_secret.py
+++ b/roles/lib_openshift/library/oc_secret.py
@@ -1441,7 +1441,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_service.py b/roles/lib_openshift/library/oc_service.py
index e83a6e26d..3e8aea4f1 100644
--- a/roles/lib_openshift/library/oc_service.py
+++ b/roles/lib_openshift/library/oc_service.py
@@ -1448,7 +1448,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_serviceaccount.py b/roles/lib_openshift/library/oc_serviceaccount.py
index 0d46bbf96..646a39224 100644
--- a/roles/lib_openshift/library/oc_serviceaccount.py
+++ b/roles/lib_openshift/library/oc_serviceaccount.py
@@ -1387,7 +1387,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_serviceaccount_secret.py b/roles/lib_openshift/library/oc_serviceaccount_secret.py
index 662d77ec1..99a8e8f3d 100644
--- a/roles/lib_openshift/library/oc_serviceaccount_secret.py
+++ b/roles/lib_openshift/library/oc_serviceaccount_secret.py
@@ -1387,7 +1387,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_storageclass.py b/roles/lib_openshift/library/oc_storageclass.py
index 574f109e4..e88f3ae8d 100644
--- a/roles/lib_openshift/library/oc_storageclass.py
+++ b/roles/lib_openshift/library/oc_storageclass.py
@@ -1405,7 +1405,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_user.py b/roles/lib_openshift/library/oc_user.py
index e430546ee..7bbe38819 100644
--- a/roles/lib_openshift/library/oc_user.py
+++ b/roles/lib_openshift/library/oc_user.py
@@ -1447,7 +1447,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_version.py b/roles/lib_openshift/library/oc_version.py
index a12620968..63adbd6ac 100644
--- a/roles/lib_openshift/library/oc_version.py
+++ b/roles/lib_openshift/library/oc_version.py
@@ -1359,7 +1359,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
diff --git a/roles/lib_openshift/library/oc_volume.py b/roles/lib_openshift/library/oc_volume.py
index 134b2ad19..3c07f8d4b 100644
--- a/roles/lib_openshift/library/oc_volume.py
+++ b/roles/lib_openshift/library/oc_volume.py
@@ -1436,7 +1436,7 @@ class OpenShiftCLIConfig(object):
         for key in sorted(self.config_options.keys()):
             data = self.config_options[key]
             if data['include'] \
-               and (data['value'] or isinstance(data['value'], int)):
+               and (data['value'] is not None or isinstance(data['value'], int)):
                 if key == ascommalist:
                     val = ','.join(['{}={}'.format(kk, vv) for kk, vv in sorted(data['value'].items())])
                 else:
-- 
cgit v1.2.3