diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-05 21:17:25 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-05 21:17:25 -0800 |
commit | 18c555e595551c3b5b54159616c5b9ece2d0983b (patch) | |
tree | ee2d65c5235476a40db81181a78a18afdc13e4e6 /roles/openshift_health_checker/openshift_checks/__init__.py | |
parent | 0c5f70ad87e25f26a074613ad4576d5bcd759054 (diff) | |
parent | 7923eb92c86a128504436ba0708c96b655de5269 (diff) | |
download | openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.gz openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.bz2 openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.tar.xz openshift-18c555e595551c3b5b54159616c5b9ece2d0983b.zip |
Merge pull request #6597 from mgugino-upstream-stage/etc-remove-become-no
Automatic merge from submit-queue.
Remove become=no from etcd cert tasks
etcd runs some actions locally to copy certs from the
CA cert host.
We shouldn't hard-code become behavior as it can be
unexpected for the end user.
Diffstat (limited to 'roles/openshift_health_checker/openshift_checks/__init__.py')
-rw-r--r-- | roles/openshift_health_checker/openshift_checks/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/roles/openshift_health_checker/openshift_checks/__init__.py b/roles/openshift_health_checker/openshift_checks/__init__.py index b7b16e0ea..83e551b5d 100644 --- a/roles/openshift_health_checker/openshift_checks/__init__.py +++ b/roles/openshift_health_checker/openshift_checks/__init__.py @@ -95,6 +95,13 @@ class OpenShiftCheck(object): # These are intended to be a sequential record of what the check observed and determined. self.logs = [] + def template_var(self, var_to_template): + """Return a templated variable if self._templar is not None, else + just return the variable as-is""" + if self._templar is not None: + return self._templar.template(var_to_template) + return var_to_template + @abstractproperty def name(self): """The name of this check, usually derived from the class name.""" |