Merge pull request #510 from jvonau/U17

U17: Ubuntu 17.10 preparations

roles/network/tasks/detected_network.yml

@@ -19,14 +19,9 @@
   include_tasks: detected_redhat.yml
   when: is_redhat
 
-- name: Check to see if dhcpcd is installed and active - Can Fail
-  shell: systemctl is-enabled dhcpcd
-  register: dhcpcd_test
-  ignore_errors: True
-
 - name: Setting dhcpcd_test results
   set_fact:
-    dhcpcd_result: "{{ dhcpcd_test.stdout }}"
+    dhcpcd_result: '{{ ansible_local.local_facts.dhcpcd }}'
 
 - name: Check /etc/network/interfaces for gateway
   shell: grep {{ device_gw }} /etc/network/interfaces | wc -l

roles/postgresql/tasks/main.yml

@@ -44,12 +44,7 @@
 - name: Initialize the postgres db
   command:  su - postgres -c "/usr/lib/postgresql/{{ postgresql_version }}/bin/initdb -E 'UTF-8' --locale={{ postgresql_locale }}  -D /library/pgsql-iiab"
             creates=/library/pgsql-iiab/pg_hba.conf
-  when: is_debian
-
-- name: Initialize the postgres db
-  command:  su - postgres -c "/usr/lib/postgresql/9.5/bin/initdb -E 'UTF-8' --locale={{ postgresql_locale }}  -D /library/pgsql-iiab"
-            creates=/library/pgsql-iiab/pg_hba.conf
-  when: is_ubuntu
+  when: is_debuntu
 
 - name: Initialize the postgres db
   command:  su - postgres -c "/usr/bin/initdb -E 'UTF-8' --lc-collate={{ postgresql_locale }} --lc-ctype={{ postgresql_locale }}  -D /library/pgsql-iiab"
@@ -80,8 +75,8 @@
            enabled=yes
   when: postgresql_enabled
 
-- name: Stop and disable postgresql service if not postgresql_enabled
-  service: name=postgresql
+- name: Stop and disable postgresql-iiab service if not postgresql_enabled
+  service: name=postgresql-iiab
            state=stopped
            enabled=no
   when: not postgresql_enabled