Refactor database role semantics (#27)

nephelaiio · Apr 2, 2024 · 076008c · 076008c
1 parent d21833c
commit 076008c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git a/molecule/databases/molecule.yml b/molecule/databases/molecule.yml
@@ -52,12 +52,8 @@ provisioner:
               roles:
                 - name: admins
                   privs: ALL
-                  type: database
-                  objs: database
                 - name: read_only
                   privs: ALL
-                  type: database
-                  objs: database
 verifier:
   name: ansible
 scenario:

diff --git a/tasks/databases.yml b/tasks/databases.yml
@@ -23,12 +23,11 @@
     db: "{{ _database.db_connect | default(postgresql_default_database) }}"
     role: "{{ _role.name }}"
     privs: "{{ _role.privs | default(omit) }}"
-    objs: "{{ _role.objs | default(omit) }}"
+    objs: "{{ _database.name }}"
     schema: "{{ _role.schema | default(omit) }}"
-    type: "{{ _role.type | default(omit) }}"
+    type: database
     grant_option: "{{ _role.grant_option | default(omit) }}"
     session_role: "{{ _database.session_role | default(omit) }}"
-    ssl_mode: "{{ _database.ssl_mode | default(omit) }}"
     state: "{{ _role.state | default('present') }}"
   vars:
     ansible_ssh_pipelining: true