summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/tasks/install_logging.yaml
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-03-07 19:45:36 -0500
committerGitHub <noreply@github.com>2017-03-07 19:45:36 -0500
commit766128bf66cbc45cb2c2539dec0472e7d378a3fb (patch)
tree9a86bc79677e0dddbaa285e912512e32efbbb945 /roles/openshift_logging/tasks/install_logging.yaml
parentd3da4d1817d54b9c3aef9fffa6ad166ec950e830 (diff)
parentab88af6414729556cabf4bde7cbb4ea83b183e3f (diff)
downloadopenshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.tar.gz
openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.tar.bz2
openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.tar.xz
openshift-766128bf66cbc45cb2c2539dec0472e7d378a3fb.zip
Merge pull request #3558 from ewolinetz/logging_metrics_defaults
Adding some more logging and metrics defaults
Diffstat (limited to 'roles/openshift_logging/tasks/install_logging.yaml')
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index e23c3f9f1..1beff3bfc 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -76,7 +76,9 @@
register: link_pull_secret
loop_control:
loop_var: sa_account
- when: openshift_logging_image_pull_secret is defined
+ when:
+ - openshift_logging_image_pull_secret is defined
+ - openshift_logging_image_pull_secret != ''
failed_when: link_pull_secret.rc != 0
- name: Scaling up cluster