Ver código fonte

Fix audit config interpolation

Denis Gladkikh 6 anos atrás
pai
commit
398edd95d7

+ 2 - 2
roles/openshift_control_plane/templates/master.yaml.v1.j2

@@ -19,8 +19,8 @@ authConfig:
     - X-Remote-Extra-
 apiLevels:
 - v1
-{% if openshift_master_audit_config is defined %}
-auditConfig:{{ openshift_master_audit_config | lib_utils_to_padded_yaml(level=1) }}
+{% if openshift.master.audit_config is defined %}
+auditConfig:{{ openshift.master.audit_config | lib_utils_to_padded_yaml(level=1) }}
 {% endif %}
 controllerConfig:
   election:

+ 1 - 0
roles/openshift_master_facts/tasks/main.yml

@@ -52,6 +52,7 @@
       kube_admission_plugin_config: "{{openshift_master_kube_admission_plugin_config | default(None) }}"  # deprecated, merged with admission_plugin_config
       image_policy_config: "{{ openshift_master_image_policy_config | default(None) }}"
       image_policy_allowed_registries_for_import: "{{ openshift_master_image_policy_allowed_registries_for_import | default(None) }}"
+      audit_config: "{{ openshift_master_audit_config | default(None) }}"
 
 - name: Determine if scheduler config present
   stat: