Merge pull request openshift#3120 from ewolinetz/logging_role_fixes

Addressing found issues with logging role
alex-berger · Jan 19, 2017 · 8db537b · 8db537b
2 parents 5a554ef + e71c296
commit 8db537b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/roles/openshift_logging/library/openshift_logging_facts.py b/roles/openshift_logging/library/openshift_logging_facts.py
@@ -105,9 +105,9 @@ def default_keys_for(self, kind):
 
     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
@@ -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: >