summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-07 20:19:04 -0500
committerGitHub <noreply@github.com>2017-03-07 20:19:04 -0500
commit36af6a92b5a211667e68c03cfcd6532c9ef8299a (patch)
tree0d57617b3985031501c2165ec4784c7f7ff822a7 /roles/openshift_logging
parent766128bf66cbc45cb2c2539dec0472e7d378a3fb (diff)
parentacc27900faf0501a22e9c20da27bd7f103392636 (diff)
downloadopenshift-36af6a92b5a211667e68c03cfcd6532c9ef8299a.tar.gz
openshift-36af6a92b5a211667e68c03cfcd6532c9ef8299a.tar.bz2
openshift-36af6a92b5a211667e68c03cfcd6532c9ef8299a.tar.xz
openshift-36af6a92b5a211667e68c03cfcd6532c9ef8299a.zip
Merge pull request #3585 from tbielawa/petset_early_fail
Petset early fail
Diffstat (limited to 'roles/openshift_logging')
-rw-r--r--roles/openshift_logging/filter_plugins/openshift_logging.py3
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml4
2 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_logging/filter_plugins/openshift_logging.py b/roles/openshift_logging/filter_plugins/openshift_logging.py
index f0007dfc7..9beffaef7 100644
--- a/roles/openshift_logging/filter_plugins/openshift_logging.py
+++ b/roles/openshift_logging/filter_plugins/openshift_logging.py
@@ -28,10 +28,11 @@ def entry_from_named_pair(register_pairs, key):
def map_from_pairs(source, delim="="):
''' Returns a dict given the source and delim delimited '''
if source == '':
- return dict()
+ return dict()
return dict(source.split(delim) for item in source.split(","))
+
# pylint: disable=too-few-public-methods
class FilterModule(object):
''' OpenShift Logging Filters '''
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 1beff3bfc..83b68fa77 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -77,8 +77,8 @@
loop_control:
loop_var: sa_account
when:
- - openshift_logging_image_pull_secret is defined
- - openshift_logging_image_pull_secret != ''
+ - openshift_logging_image_pull_secret is defined
+ - openshift_logging_image_pull_secret != ''
failed_when: link_pull_secret.rc != 0
- name: Scaling up cluster