Support harbor_config_reject

stackhpc · Jun 14, 2021 · 228360a · 228360a
1 parent a1597f7
commit 228360a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/defaults/main.yaml b/defaults/main.yaml
@@ -30,6 +30,7 @@ harbor_config:
     password: "{{ harbor_database_password }}"
 
 harbor_database_password: "root123"
+harbor_config_reject: []
 
 # This overrides harbor template and harbor_config.
 # See additional config options here: https://github.com/goharbor/harbor/blob/master/make/harbor.yml.tmpl

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -63,7 +63,7 @@
 
 - name: "Combine harbor config with template"
   set_fact:
-    harbor_yml: "{{ harbor_yml_tmpl.content | b64decode | from_yaml | combine(harbor_config, recursive=True) |  combine(harbor_extra_config, recursive=True) }}"
+    harbor_yml: "{{ harbor_yml_tmpl.content | b64decode | from_yaml | combine(harbor_config, recursive=True) |  combine(harbor_extra_config, recursive=True) | dict2items | rejectattr('key', 'in', harbor_config_reject) | items2dict }}"
 
 - name: "Write combined config to harbor.yml"
   blockinfile: