change typo and converge yaml

Icinga · Sep 26, 2023 · 5e4e067 · 5e4e067
1 parent 875deb8
commit 5e4e067
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/molecule/default/converge.yml b/molecule/default/converge.yml
@@ -71,12 +71,20 @@
       - zones.d/main/commands
       - zones.d/main/hosts
       - zones.d/main/services
-  roles:
-    - icinga.icinga.repos
-    - icinga.icinga.icinga2
-    - geerlingguy.mysql
-    - icinga.icinga.icingadb
-    - icinga.icinga.icingadb_redis
+  collections:
+    - icinga.icinga
+  pre_tasks:
+    - include_role:
+        name: repos
+    - include_role:
+        name: geerlingguy.mysql
+    - include_role:
+        name: icinga2
+    - include_role:
+        name: icingadb
+    - include_role:
+        name: icingadb_redis
+
   post_tasks:
     - include_role:
-        name: icinga.icinga.icingaweb2
+        name: icingaweb2
diff --git a/roles/icingaweb2/templates/ini_template.j2 b/roles/icingaweb2/templates/ini_template.j2
@@ -3,10 +3,9 @@
 
 [{{ section }}]
 {% for option, value in options.items() %}
-{% if variable is number %}
+{% if value is number %}
 {{ option }} = "{{ value }}"
-{% elif %}
-{% if value is iterable and (value is not string and value is not mapping) %}
+{% elif value is iterable and (value is not string and value is not mapping) %}
 {{ option }} = "{{ value | join(', ') }}"
 {% elif value is string and "=" in value %}
 {% else %}