ansible · gundalow · Sep 25, 2019 · Sep 25, 2019
diff --git a/test/integration/targets/postgresql/aliases → .../targets/postgresql_db_user_privs/aliases b/test/integration/targets/postgresql/aliases → .../targets/postgresql_db_user_privs/aliases
diff --git a/...tion/targets/postgresql/defaults/main.yml → ...ostgresql_db_user_privs/defaults/main.yml b/...tion/targets/postgresql/defaults/main.yml → ...ostgresql_db_user_privs/defaults/main.yml
@@ -32,9 +32,3 @@ pg_hba_test_ips:
 - source: '172.16.0.0'
   netmask: '255.255.0.0'
   method: trust
-
-# defaults for test SSL
-ssl_db: 'ssl_db'
-ssl_user: 'ssl_user'
-ssl_pass: 'ssl_pass'
-ssl_rootcert: '~{{ pg_user }}/root.crt'
diff --git a/...egration/targets/postgresql/meta/main.yml → ...ts/postgresql_db_user_privs/meta/main.yml b/...egration/targets/postgresql/meta/main.yml → ...ts/postgresql_db_user_privs/meta/main.yml
diff --git a/...gration/targets/postgresql/tasks/main.yml → ...s/postgresql_db_user_privs/tasks/main.yml b/...gration/targets/postgresql/tasks/main.yml → ...s/postgresql_db_user_privs/tasks/main.yml
@@ -1,15 +1,6 @@
 # Unsorted tests that were moved from here to unsorted.yml
 - import_tasks: unsorted.yml
 
-# Test ssl.
-# Restricted using Debian family because of there are errors on other distributions
-# that not related with PostgreSQL or psycopg2 SSL support.
-# The tests' key point is to be sure that ssl options work in general
-- import_tasks: ssl.yml
-  when:
-  - ansible_os_family == 'Debian'
-  - postgres_version_resp.stdout is version('9.4', '>=')
-
 - include_tasks: '{{ loop_item }}'
   loop:
   # Test postgresql_user module

diff --git a/...stgresql/tasks/pg_authid_not_readable.yml → ...er_privs/tasks/pg_authid_not_readable.yml b/...stgresql/tasks/pg_authid_not_readable.yml → ...er_privs/tasks/pg_authid_not_readable.yml
diff --git a/...argets/postgresql/tasks/postgresql_db.yml → ...sql_db_user_privs/tasks/postgresql_db.yml b/...argets/postgresql/tasks/postgresql_db.yml → ...sql_db_user_privs/tasks/postgresql_db.yml
diff --git a/...ets/postgresql/tasks/postgresql_privs.yml → ..._db_user_privs/tasks/postgresql_privs.yml b/...ets/postgresql/tasks/postgresql_privs.yml → ..._db_user_privs/tasks/postgresql_privs.yml
diff --git a/...gets/postgresql/tasks/postgresql_user.yml → ...l_db_user_privs/tasks/postgresql_user.yml b/...gets/postgresql/tasks/postgresql_user.yml → ...l_db_user_privs/tasks/postgresql_user.yml
diff --git a/...targets/postgresql/tasks/session_role.yml → ...esql_db_user_privs/tasks/session_role.yml b/...targets/postgresql/tasks/session_role.yml → ...esql_db_user_privs/tasks/session_role.yml
diff --git a/...s/postgresql/tasks/state_dump_restore.yml → ...b_user_privs/tasks/state_dump_restore.yml b/...s/postgresql/tasks/state_dump_restore.yml → ...b_user_privs/tasks/state_dump_restore.yml
diff --git a/...tgresql/tasks/test_no_password_change.yml → ...r_privs/tasks/test_no_password_change.yml b/...tgresql/tasks/test_no_password_change.yml → ...r_privs/tasks/test_no_password_change.yml
diff --git a/...argets/postgresql/tasks/test_password.yml → ...sql_db_user_privs/tasks/test_password.yml b/...argets/postgresql/tasks/test_password.yml → ...sql_db_user_privs/tasks/test_password.yml
diff --git a/...ets/postgresql/tasks/test_target_role.yml → ..._db_user_privs/tasks/test_target_role.yml b/...ets/postgresql/tasks/test_target_role.yml → ..._db_user_privs/tasks/test_target_role.yml
diff --git a/...ion/targets/postgresql/tasks/unsorted.yml → ...stgresql_db_user_privs/tasks/unsorted.yml b/...ion/targets/postgresql/tasks/unsorted.yml → ...stgresql_db_user_privs/tasks/unsorted.yml
diff --git a/test/integration/targets/postgresql_ping/tasks/postgresql_ping_initial.yml b/test/integration/targets/postgresql_ping/tasks/postgresql_ping_initial.yml
@@ -33,3 +33,26 @@
       - result.is_available == false
       - result.server_version == {}
       - result is not changed
+
+- name: postgresql_ping - ping DB with SSL
+  become_user: "{{ pg_user }}"
+  become: yes
+  postgresql_ping:
+    db: "{{ ssl_db }}"
+    login_user: "{{ ssl_user }}"
+    login_password: "{{ ssl_pass }}"
+    login_host: 127.0.0.1
+    login_port: 5432
+    ssl_mode: require
+    ca_cert: '{{ ssl_rootcert }}'
+  register: result
+  when:
+  - ansible_os_family == 'Debian'
+  - postgres_version_resp.stdout is version('9.4', '>=')
+
+- assert:
+    that: 
+    - result.is_available == true
+  when:
+  - ansible_os_family == 'Debian'
+  - postgres_version_resp.stdout is version('9.4', '>=')
diff --git a/test/integration/targets/setup_postgresql_db/defaults/main.yml b/test/integration/targets/setup_postgresql_db/defaults/main.yml
@@ -9,3 +9,9 @@ pg_group: root
 
 locale_latin_suffix:
 locale_utf8_suffix:
+
+# defaults for test SSL
+ssl_db: 'ssl_db'
+ssl_user: 'ssl_user'
+ssl_pass: 'ssl_pass'
+ssl_rootcert: '~{{ pg_user }}/root.crt'
diff --git a/test/integration/targets/setup_postgresql_db/tasks/main.yml b/test/integration/targets/setup_postgresql_db/tasks/main.yml
@@ -190,3 +190,12 @@
 - name: Print PostgreSQL server version
   debug:
     msg: "{{ postgres_version_resp.stdout }}"
+
+# SSL configuration.
+# Restricted using Debian family because of there are errors on other distributions
+# that not related with PostgreSQL or psycopg2 SSL support.
+# The tests key point is to be sure that ssl options work in general
+- import_tasks: ssl.yml
+  when:
+  - ansible_os_family == 'Debian'
+  - postgres_version_resp.stdout is version('9.4', '>=')
diff --git a/...egration/targets/postgresql/tasks/ssl.yml → ...targets/setup_postgresql_db/tasks/ssl.yml b/...egration/targets/postgresql/tasks/ssl.yml → ...targets/setup_postgresql_db/tasks/ssl.yml
@@ -79,27 +79,3 @@
   service:
     name: "{{ postgresql_service }}"
     state: reloaded
-
-###############
-# Do main tests
-
-- name: postgresql SSL - ping DB with SSL
-  become_user: "{{ pg_user }}"
-  become: yes
-  postgresql_ping:
-    db: "{{ ssl_db }}"
-    login_user: "{{ ssl_user }}"
-    login_password: "{{ ssl_pass }}"
-    login_host: 127.0.0.1
-    login_port: 5432
-    ssl_mode: require
-    ca_cert: '{{ ssl_rootcert }}'
-  register: result
-
-- assert:
-    that: 
-    - result.is_available == true
-
-###################################################
-# I decided not to clean ssl_db, ssl_user and certs
-# for testing options related with SSL in other modules