Code Refactoring

* Reduced the number of lines of code. Now we use "default (omit)" for the variable "proxy_env";
* Modules "apt" and "yum" have been replaced by the module "package";
* The tasks "Install EPEL Repository" and "install PostgreSQL repository" were transferred to the add-repository.yml file (for RedHad based);
The variables "install_epel_repo" and "install_postgresql_repo" were added to the variable file RedHat.yml;
* The variables "os_valid_distributions" and "os_minimum_versions" were transferred from the variable file "main.yml" to the group_vars file postgres_cluster;
* "with_items" were replaced by "loop" (with the release of Ansible 2.5, the recommended way to perform loops is the use the new loop keyword instead of with_X style loops);
* Minor code corrections.

Author: vitabaks

group_vars/postgres_cluster

@@ -0,0 +1,14 @@
+---
+# "Check system" variables
+
+os_valid_distributions:
+  - RedHat
+  - CentOS
+  - Ubuntu
+  - Debian
+
+os_minimum_versions:
+  RedHat: 7
+  CentOS: 7
+  Ubuntu: 16.04
+  Debian: 8

tags.md

@@ -2,6 +2,8 @@
 ## Available tags
 
 - add_repo
+- - install_epel_repo
+- - install_postgresql_repo
 - install_packages
 - - install_postgres
 - sudo

tasks/add-repository.yml

@@ -6,41 +6,18 @@
       apt_key:
         url: "{{ item.key }}"
         state: present
-      with_items: "{{ apt_repository_keys }}"
-      when: (proxy_env is not defined) or (proxy_env | length < 1)
+      loop: "{{ apt_repository_keys }}"
 
     - name: Add repository
       apt_repository:
         repo: "{{ item.repo }}"
         state: present
         update_cache: yes
-      with_items: "{{ apt_repository }}"
-      when: (proxy_env is not defined) or (proxy_env | length < 1)
-
-
-    - name: Add repository apt-key (behind a proxy)
-      apt_key:
-        url: "{{ item.key }}"
-        state: present
-      with_items: "{{ apt_repository_keys }}"
-      environment:
-        "{{ proxy_env }}"
-      when: proxy_env | length > 0
-
-    - name: Add repository (behind a proxy)
-      apt_repository:
-        repo: "{{ item.repo }}"
-        state: present
-        update_cache: yes
-      with_items: "{{ apt_repository }}"
-      environment:
-        "{{ proxy_env }}"
-      when: proxy_env | length > 0
-
+      loop: "{{ apt_repository }}"
+  environment: "{{ proxy_env | default(omit) }}"
   when: ansible_os_family == "Debian"
   tags: add_repo
 
-
 # RedHat CentOS
 - block:
     - name: Add repository
@@ -49,20 +26,32 @@
         description: "{{ item.description }}"
         baseurl: "{{ item.baseurl }}"
         gpgkey: "{{ item.gpgkey }}"
-      with_items: "{{ yum_repository }}"
-      when: (yum_repository length > 0) and (proxy_env is not defined or proxy_env | length < 1)
-
-    - name: Add repository (behind a proxy)
-      yum_repository:
-        name: "{{ item.name }}"
-        description: "{{ item.description }}"
-        baseurl: "{{ item.baseurl }}"
-        gpgkey: "{{ item.gpgkey }}"
-      with_items: "{{ yum_repository }}"
-      environment:
-        "{{ proxy_env }}"
-      when: (yum_repository length > 0) and (proxy_env | length > 0)
-
+      loop: "{{ yum_repository | flatten(1) }}"
+      when: yum_repository length > 0
+
+    # Install Epel Repository
+    - name: Install | EPEL Repository
+      package:
+        name: epel-release
+      when: install_epel_repo == "true"
+      tags: install_epel_repo
+
+    # Install PostgreSQL Repository
+    - name: install | get pgdg-redhat-repo-latest.noarch.rpm
+      get_url:
+        url: "https://download.postgresql.org/pub/repos/yum/reporpms/EL-{{ ansible_distribution_major_version }}-x86_64/pgdg-redhat-repo-latest.noarch.rpm"
+        dest: /tmp/
+        timeout: 30
+        validate_certs: no
+      when: install_postgresql_repo == "true"
+      tags: install_postgresql_repo
+
+    - name: install | PostgreSQL repository
+      package:
+        name: /tmp/pgdg-redhat-repo-latest.noarch.rpm
+        state: present
+      when: install_postgresql_repo == "true"
+      tags: install_postgresql_repo
+  environment: "{{ proxy_env | default(omit) }}"
   when: ansible_os_family == "RedHat"
   tags: add_repo
-

tasks/confd.yml

@@ -7,26 +7,14 @@
     mode: u+x,g+x,o+x
     timeout: 30
     validate_certs: no
-  when: (proxy_env is not defined) or (proxy_env | length < 1)
-  tags: [ get_confd, confd ]
-
-- name: confd | download and copy "confd" binary file to /usr/local/bin (behind a proxy)
-  get_url:
-    url: https://github.com/kelseyhightower/confd/releases/download/v0.16.0/confd-0.16.0-linux-amd64
-    dest: /usr/local/bin/confd
-    mode: u+x,g+x,o+x
-    timeout: 30
-    validate_certs: no
-  environment:
-    "{{ proxy_env }}"
-  when: proxy_env | length > 0
+  environment: "{{ proxy_env | default(omit) }}"
   tags: [ get_confd, confd ]
 
 - name: confd | create conf directories
   file:
     path: "{{ item }}"
     state: directory
-  with_items:
+  loop:
     - /etc/confd/conf.d
     - /etc/confd/templates
   tags: [ confd_dir, confd_conf, confd ]

tasks/deploy_finish.yml

@@ -76,15 +76,13 @@
   ignore_errors: yes
   tags: conn_info
 
-
 - block:
     - name: Virtual IP Address (VIP) info
       set_fact:
         man_ip: "{{ item }}"
-      with_items: "{{ ansible_all_ipv4_addresses }}"
+      loop: "{{ ansible_all_ipv4_addresses }}"
       when: item == cluster_vip
     - debug:
         msg: Cluster ip address (VIP) {{ cluster_vip }} is running on server "{{ ansible_hostname }}"
       when: man_ip is defined and man_ip == cluster_vip
   tags: [ vip_owner, vip_status ]
-

tasks/etcd.yml

@@ -6,25 +6,15 @@
     dest: /tmp/
     remote_src: yes
     validate_certs: no
-  when: (proxy_env is not defined) or (proxy_env | length < 1)
-
-- name: etcd cluster | download and extract "etcd" into /tmp (behind a proxy)
-  unarchive:
-    src: https://github.com/etcd-io/etcd/releases/download/{{ etcd_ver }}/etcd-{{ etcd_ver }}-linux-amd64.tar.gz
-    dest: /tmp/
-    remote_src: yes
-    validate_certs: no
-  environment:
-    "{{ proxy_env }}"
-  when: proxy_env | length > 0
+  environment: "{{ proxy_env | default(omit) }}"
 
 - name: etcd cluster | copy "etcd" and "etcdctl" binary files to /usr/local/bin/
   copy:
     src: "/tmp/etcd-{{ etcd_ver }}-linux-amd64/{{ item }}"
     dest: /usr/local/bin/
     mode: u+x,g+x,o+x
     remote_src: yes
-  with_items:
+  loop:
     - etcd
     - etcdctl
 

tasks/haproxy.yml

@@ -21,10 +21,8 @@
 
       # "Debian"
     - name: haproxy | Install the prerequisites packages to compile HAProxy
-      apt:
-        update_cache: yes
+      package:
         name: "{{ packages }}"
-        state: present
       vars:
         packages:
         - unzip
@@ -42,10 +40,8 @@
 
       # "RedHat"
     - name: haproxy | Install the prerequisites packages to compile HAProxy
-      yum:
-        update_cache: yes
+      package:
         name: "{{ packages }}"
-        state: present
       vars:
         packages:
         - unzip
@@ -59,78 +55,7 @@
         - openssl-libs
         - systemd-devel
       when: ansible_os_family == "RedHat"
-  when: (proxy_env is not defined) or (proxy_env | length < 1)
-
-# with proxy
-- block:
-    - name: "haproxy | download HAProxy {{ haproxy_version }} source files (behind a proxy)"
-      become: yes
-      become_user: root
-      unarchive:
-        src: http://www.haproxy.org/download/{{ haproxy_major }}/src/haproxy-{{ haproxy_version }}.tar.gz
-        dest: /tmp/
-        remote_src: yes
-      environment:
-        "{{ proxy_env }}"
-
-    - name: "haproxy | download lua-5.3.5 source files (behind a proxy)"
-      become: yes
-      become_user: root
-      unarchive:
-        src: https://www.lua.org/ftp/lua-5.3.5.tar.gz
-        dest: /tmp/
-        remote_src: yes
-        validate_certs: no
-      environment:
-        "{{ proxy_env }}"
-      tags: lua
-
-      # "Debian"
-    - name: haproxy | install the prerequisites packages to compile HAProxy (behind a proxy)
-      apt:
-        update_cache: yes
-        name: "{{ packages }}"
-        state: present
-      vars:
-        packages:
-        - unzip
-        - gzip
-        - build-essential
-        - libc6-dev
-        - libpcre3-dev
-        - liblua5.3-dev
-        - libreadline-dev
-        - zlib1g-dev
-        - libsystemd-dev
-        - ca-certificates
-        - libssl-dev
-      environment:
-        "{{ proxy_env }}"
-      when: ansible_os_family == "Debian"
-
-      # "RedHat"
-    - name: haproxy | install the prerequisites packages to compile HAProxy (behind a proxy)
-      yum:
-        update_cache: yes
-        name: "{{ packages }}"
-        state: present
-      vars:
-        packages:
-        - unzip
-        - gzip
-        - "@Development tools"
-        - pcre-devel
-        - zlib-devel
-        - readline-devel
-        - openssl
-        - openssl-devel
-        - openssl-libs
-        - systemd-devel
-      environment:
-        "{{ proxy_env }}"
-      when: ansible_os_family == "RedHat"
-  when: proxy_env | length > 0
-
+  environment: "{{ proxy_env | default(omit) }}"
 
 - name: haproxy | add haproxy group
   group:
@@ -150,7 +75,7 @@
     state: directory
     owner: haproxy
     group: haproxy
-  with_items:
+  loop:
     - /etc/haproxy
     - /var/run/haproxy
     - /var/lib/haproxy/dev
@@ -231,4 +156,3 @@
   # virtual ip address (and haproxy health checking)
 - import_tasks: ../tasks/keepalived.yml
   tags: keepalived
-

tasks/hostname.yml

@@ -12,7 +12,7 @@
     line: "{{ item.line }}"
     state: present
   no_log: True
-  with_items:
+  loop:
    - { regexp: '^127\.0\.0\.1[ \t]+localhost', line: '127.0.0.1 localhost {{ ansible_hostname }}' }
    - { regexp: '^{{ ansible_default_ipv4.address }}.+$', line: '{{ ansible_default_ipv4.address }} {{ ansible_hostname }}' }
   when: hostname_result.changed

tasks/keepalived.yml

@@ -3,19 +3,7 @@
 - name: keepalived | install packages
   package:
     name: keepalived
-    state: present
-    update_cache: yes
-  when: (proxy_env is not defined) or (proxy_env | length < 1)
-  tags: [ keepalived_install, keepalived ]
-
-- name: keepalived | install packages (behind a proxy)
-  package:
-    name: keepalived
-    state: present
-    update_cache: yes
-  environment:
-    "{{ proxy_env }}"
-  when: proxy_env | length > 0
+  environment: "{{ proxy_env | default(omit) }}"
   tags: [ keepalived_install, keepalived ]
 
 - name: keepalived | make sure the kernel parameters "net.ipv4.ip_nonlocal_bind", "net.ipv4.ip_forward" are enabled
@@ -25,7 +13,7 @@
     sysctl_set: "yes"
     state: "present"
     reload: "yes"
-  with_items:
+  loop:
     - "net.ipv4.ip_nonlocal_bind"
     - "net.ipv4.ip_forward"
   tags: [ keepalived_conf, keepalived ]

tasks/locales.yml

@@ -6,16 +6,13 @@
   locale_gen:
     name: "{{ item.language_country }}.{{ item.encoding }}"
     state: present
-  with_items:
-    - "{{ locales }}"
+  loop: "{{ locales | flatten(1) }}"
   when: ansible_os_family == "Debian"
 
   # RedHat
 - name: Generate locales "{% for set in locales %}{{ set.language_country }}.{{ set.encoding }}{% if not loop.last %},{% endif %}{% endfor %}"
   become: yes
   command: localedef -c -i {{ item.language_country }} -f {{ item.encoding }} {{ item.language_country }}.{{ item.encoding }}
   changed_when: false
-  with_items:
-    - "{{ locales }}"
+  loop: "{{ locales | flatten(1) }}"
   when: ansible_os_family == "RedHat"
-

tasks/ntp.yml

@@ -3,19 +3,7 @@
 - name: ntp | install package
   package:
     name: ntp
-    state: present
-    update_cache: yes
-  when: (proxy_env is not defined) or (proxy_env | length < 1)
-  tags: [ ntp_install, ntp ]
-
-- name: ntp | install package (behind a proxy)
-  package:
-    name: ntp
-    state: present
-    update_cache: yes
-  environment:
-    "{{ proxy_env }}"
-  when: proxy_env | length > 0
+  environment: "{{ proxy_env | default(omit) }}"
   tags: [ ntp_install, ntp ]
 
 - name: ntp | copy the ntp.conf template file
@@ -39,4 +27,3 @@
     enabled: yes
     state: restarted
   when: ansible_os_family == "RedHat"
-