diff options
author | Jason DeTiberus <detiber@gmail.com> | 2017-01-19 10:04:36 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-19 10:04:36 -0500 |
commit | 8db537b2ca509751f927fac25261121b1acd680b (patch) | |
tree | 7d168c3a9324e5f5f51f7b91b165d11343429868 | |
parent | 5a554ef3c2892f71c4c0c6be162185f312ba67e7 (diff) | |
parent | e71c29687d12a4a5e88b7cffcece634816b1e1e5 (diff) | |
download | openshift-8db537b2ca509751f927fac25261121b1acd680b.tar.gz openshift-8db537b2ca509751f927fac25261121b1acd680b.tar.bz2 openshift-8db537b2ca509751f927fac25261121b1acd680b.tar.xz openshift-8db537b2ca509751f927fac25261121b1acd680b.zip |
Merge pull request #3120 from ewolinetz/logging_role_fixes
Addressing found issues with logging role
-rw-r--r-- | roles/openshift_logging/library/openshift_logging_facts.py | 4 | ||||
-rw-r--r-- | roles/openshift_logging/tasks/generate_configmaps.yaml | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging/library/openshift_logging_facts.py b/roles/openshift_logging/library/openshift_logging_facts.py index 8bbfdf7bf..64bc33435 100644 --- a/roles/openshift_logging/library/openshift_logging_facts.py +++ b/roles/openshift_logging/library/openshift_logging_facts.py @@ -105,9 +105,9 @@ class OpenshiftLoggingFacts(OCBaseCommand): def add_facts_for(self, comp, kind, name=None, facts=None): ''' Add facts for the provided kind ''' - if comp in self.facts is False: + if comp not in self.facts: self.facts[comp] = dict() - if kind in self.facts[comp] is False: + if kind not in self.facts[comp]: self.facts[comp][kind] = dict() if name: self.facts[comp][kind][name] = facts diff --git a/roles/openshift_logging/tasks/generate_configmaps.yaml b/roles/openshift_logging/tasks/generate_configmaps.yaml index b24a7c342..8fcf517ad 100644 --- a/roles/openshift_logging/tasks/generate_configmaps.yaml +++ b/roles/openshift_logging/tasks/generate_configmaps.yaml @@ -49,7 +49,7 @@ - copy: content: "{{curator_config_contents}}" dest: "{{mktemp.stdout}}/curator.yml" - when: curator_config_contenets is defined + when: curator_config_contents is defined changed_when: no - command: > |