Quellcode durchsuchen

Merge pull request #3120 from ewolinetz/logging_role_fixes

Addressing found issues with logging role
Jason DeTiberus vor 8 Jahren
Ursprung
Commit
8db537b2ca

+ 2 - 2
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

+ 1 - 1
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: >