Resolve ANXS#361 : Revert to using Ansible service module for restart…

…ing Postgresql on RH systems
Sammyant · Sep 17, 2018 · 0511b6a · 0511b6a
1 parent d0cc433
commit 0511b6a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 15 deletions.
diff --git a/handlers/main.yml b/handlers/main.yml
@@ -1,15 +1,7 @@
 # file: postgresql/handlers/main.yml
 
-  - name: restart postgresql with service
+  - name: restart postgresql
     service:
       name: "{{ postgresql_service_name }}"
       state: restarted
       enabled: yes
-
-  - name: restart postgresql with systemd
-    systemd:
-      name: "{{ postgresql_service_name }}"
-      state: restarted
-      enabled: yes
-    when: ansible_service_mgr == 'systemd'
-
diff --git a/tasks/configure.yml b/tasks/configure.yml
@@ -160,7 +160,7 @@
     group: "{{ postgresql_service_group }}"
     mode: 0640
   register: postgresql_configuration_pt4
-  notify: restart postgresql with service
+  notify: restart postgresql
 
 - name: PostgreSQL | Create folder for additional configuration files
   file:
@@ -176,7 +176,7 @@
     state: directory
     mode: 0755
   when: ansible_os_family == "RedHat"
-  notify: restart postgresql with systemd
+  notify: restart postgresql
 
 - name: PostgreSQL | Use the conf directory when starting the Postgres service | RedHat
   template:
@@ -192,7 +192,7 @@
     owner: "{{ postgresql_service_user }}"
     group: "{{ postgresql_service_group }}"
     mode: u=rwX,g=rwXs,o=rx
-  notify: restart postgresql with service
+  notify: restart postgresql
 
 - name: PostgreSQL | Reload all conf files
   service:

diff --git a/tasks/extensions/dev_headers.yml b/tasks/extensions/dev_headers.yml
@@ -20,14 +20,13 @@
     - "postgresql{{ postgresql_version_terse }}-devel"
   when: ansible_pkg_mgr == "yum" and ansible_os_family == "RedHat"
   notify:
-    - restart postgresql with service
-    - restart postgresql with systemd
+    - restart postgresql
 
 - name: PostgreSQL | Extensions | Make sure the development headers are installed | Fedora
   dnf:
     name: "postgresql{{ postgresql_version_terse }}-libs, postgresql{{ postgresql_version_terse }}-devel"
     state: present
   when: ansible_pkg_mgr == "dnf" and ansible_distribution == "Fedora"
   notify:
-    - restart postgresql with systemd
+    - restart postgresql