Merge "Merge haproxy plays"

playbooks/haproxy-install.yml

@@ -29,22 +29,6 @@
       static: no
       when:
         - hostvars['localhost']['resolvconf_enabled'] | bool
-  roles:
-    - role: "keepalived"
-      when: haproxy_use_keepalived | bool
-      tags:
-        - keepalived
-  environment: "{{ deployment_environment_variables | default({}) }}"
-  tags:
-    - haproxy-config
-    - haproxy
-
-- name: Install haproxy
-  hosts: haproxy
-  serial: "50%"
-  gather_facts: "{{ osa_gather_facts | default(True) }}"
-  user: root
-  pre_tasks:
     - name: Remove legacy haproxy configuration files
       file:
         dest: "/etc/haproxy/conf.d/{{ item.name }}"
@@ -65,6 +49,10 @@
       tags:
         - haproxy-config  # this tag is present because the task is ONLY a config task
   roles:
+    - role: "keepalived"
+      when: haproxy_use_keepalived | bool
+      tags:
+        - keepalived
     - role: "haproxy_server"
       haproxy_service_configs: "{{ haproxy_default_services + haproxy_extra_services|default([]) }}"
     - role: "rsyslog_client"
@@ -75,4 +63,5 @@
         - rsyslog
   environment: "{{ deployment_environment_variables | default({}) }}"
   tags:
+    - haproxy-config
     - haproxy