diff options
| author | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-28 08:32:29 -0500 |
|---|---|---|
| committer | Eric Wolinetz <ewolinet@redhat.com> | 2017-09-29 14:12:39 -0500 |
| commit | fb9f2062cae9744854f948285a79e1718a5837d1 (patch) | |
| tree | 7bf1b152fbf3dd62acb41c7539fd9b93f85712a1 | |
| parent | 23c44b36cce3f944a07f4960aa1e1b58f6b12756 (diff) | |
| download | openshift-fb9f2062cae9744854f948285a79e1718a5837d1.tar.gz openshift-fb9f2062cae9744854f948285a79e1718a5837d1.tar.bz2 openshift-fb9f2062cae9744854f948285a79e1718a5837d1.tar.xz openshift-fb9f2062cae9744854f948285a79e1718a5837d1.zip | |
Addressing tox issues
| -rw-r--r-- | roles/openshift_sanitize_inventory/filter_plugins/openshift_sanitize_inventory.py | 7 | ||||
| -rw-r--r-- | roles/openshift_sanitize_inventory/tasks/unsupported.yml | 6 |
2 files changed, 8 insertions, 5 deletions
diff --git a/roles/openshift_sanitize_inventory/filter_plugins/openshift_sanitize_inventory.py b/roles/openshift_sanitize_inventory/filter_plugins/openshift_sanitize_inventory.py index d8515528c..72c47b8ee 100644 --- a/roles/openshift_sanitize_inventory/filter_plugins/openshift_sanitize_inventory.py +++ b/roles/openshift_sanitize_inventory/filter_plugins/openshift_sanitize_inventory.py @@ -1,10 +1,11 @@ -import re - ''' Openshift Sanitize inventory class that provides useful filters used in Logging. ''' +import re + + # This should be removed after map_from_pairs is no longer used in __deprecations_logging.yml def map_from_pairs(source, delim="="): ''' Returns a dict given the source and delim delimited ''' @@ -25,7 +26,7 @@ def vars_with_pattern(source, pattern=""): for item in source: if var_pattern.match(item): - var_list.append(item) + var_list.append(item) return var_list diff --git a/roles/openshift_sanitize_inventory/tasks/unsupported.yml b/roles/openshift_sanitize_inventory/tasks/unsupported.yml index 9059cf1ea..39bf1780a 100644 --- a/roles/openshift_sanitize_inventory/tasks/unsupported.yml +++ b/roles/openshift_sanitize_inventory/tasks/unsupported.yml @@ -20,13 +20,15 @@ - name: Ensure that dynamic provisioning is set if using dynamic storage when: + - dynamic_volumes_check | default(true) | bool - not openshift_master_dynamic_provisioning_enabled | default(false) | bool - not openshift_cloudprovider_kind is defined - - __using_dynamic | bool + - __using_dynamic is defined and __using_dynamic | bool fail: msg: |- Using a storage kind of 'dynamic' without enabling dynamic provisioning nor setting a cloud provider will cause generated PVCs to not be able to bind as intended. Either update to not use a dynamic storage or set openshift_master_dynamic_provisioning_enabled to True and set an - openshift_cloudprovider_kind. + openshift_cloudprovider_kind. You can disable this check with + 'dynamic_volumes_check=False'. |