chore(osm2pgsql): Ensure account using meta, adding variable configur…

…ation
osm-fr · Nov 7, 2023 · 641d31e · 641d31e
1 parent 8c72808
commit 641d31e
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 7 deletions.
diff --git a/.config/ansible-lint-ignore.txt b/.config/ansible-lint-ignore.txt
@@ -15,7 +15,6 @@ live.yml name[casing]
 munin-server.yml name[casing]
 nextcloud.yml name[casing]
 ocitysmap.yml name[casing]
-osm2pgsql.yml name[casing]
 osmbin.yml name[casing]
 osmose-backend.yml name[casing]
 osmose-frontend.yml name[casing]

diff --git a/osm2pgsql.yml b/osm2pgsql.yml
@@ -1,11 +1,6 @@
-- name: osm2pgsql configuration
+- name: Configure osm2pgsql
   hosts: osm2pgsql
   gather_facts: no
   become: yes
   roles:
-    - accounts
     - osm2pgsql
-  vars:
-    accounts__users:
-      osm2pgsql:
-        service: true
diff --git a/roles/osm2pgsql/defaults/main.yml b/roles/osm2pgsql/defaults/main.yml
@@ -0,0 +1,3 @@
+---
+osm2pgsql__user: osm2pgsql
+...
diff --git a/roles/osm2pgsql/meta/main.yml b/roles/osm2pgsql/meta/main.yml
@@ -0,0 +1,8 @@
+---
+dependencies:
+  - role: accounts
+    vars:
+      accounts__users:
+        "{{ osm2pgsql__user }}":
+          service: true
+...