Extending Ansible role haproxy-check-initial

diff --git a/inventory/dpx-ldap-dev1.yaml b/inventory/dpx-ldap-dev1.yaml
index d63b43c0967b7c358047e5fe645c2da57a7a5f8a..1e2c294a873c6fce1c02890c553e45351b03c602 100644 (file)
--- a/inventory/dpx-ldap-dev1.yaml
+++ b/inventory/dpx-ldap-dev1.yaml
@@ -25,8 +25,6 @@ all:
     replication_manager_password_file: '/root/.private/dirserv-repl-mngr-pwd.txt'
     replication_manager_idle_timeout: 0
     haproxy_backend_name: 'be-ldap-dev1'
-    haproxy_user_socket: '/run/haproxy/user.sock'
-    haproxy_admin_socket: '/run/haproxy/admin.sock'
     # ds389_plugin_attr_uniq_purge: false
     ds389_plugin_attr_uniq_attributes:
       'uid':

diff --git a/inventory/spk-ldap-stage.yaml b/inventory/spk-ldap-stage.yaml
index 13ac24c87aa4e720634f82fcdcea140cfe73699e..f536d71a33f6a71263d8104626fc9615e8e03c45 100644 (file)
--- a/inventory/spk-ldap-stage.yaml
+++ b/inventory/spk-ldap-stage.yaml
@@ -22,8 +22,6 @@ all:
     replication_manager_password_file: '/root/.private/dirserv-repl-mngr-pwd.txt'
     replication_manager_idle_timeout: 0
     haproxy_backend_name: 'be-stage-ldap'
-    haproxy_user_socket: '/run/haproxy/user.sock'
-    haproxy_admin_socket: '/run/haproxy/admin.sock'
     ds389_plugin_attr_uniq_config: false
     # ds389_plugin_attr_uniq_purge: false
     ds389_plugin_attr_uniq_attributes:

diff --git a/roles/haproxy-check-initial/tasks/main.yaml b/roles/haproxy-check-initial/tasks/main.yaml
index 8d76537846fc6d8ce1d2687f76c9a8351af1f99a..9875965e690fd15b4090f19059560f0b2945803d 100644 (file)
--- a/roles/haproxy-check-initial/tasks/main.yaml
+++ b/roles/haproxy-check-initial/tasks/main.yaml
@@ -28,4 +28,64 @@
     msg: "No HAProxy server found on host '{{ inventory_hostname }}'."
   when: version_haproxy == ''
 
+- name: "Get file stat of HAProxy admin socket ..."
+  ansible.builtin.stat:
+    path: "{{ haproxy_admin_socket }}"
+  register: admin_socket
+
+- name: "File stat of HAProxy admin socket: "
+  debug:
+    var: admin_socket
+    verbosity: 3
+
+- name: "Check existence of HAProxy admin socket."
+  ansible.builtin.fail:
+    msg: "The HAProxy admin socket '{{ haproxy_admin_socket }}' does not exists."
+  when: admin_socket.stat.exists != true
+
+- name: "Checking, whether '{{ haproxy_admin_socket }}' is a socket."
+  ansible.builtin.fail:
+    msg: "The path '{{ haproxy_admin_socket }}' for the HAProxy admin socket is not a socket."
+  when: admin_socket.stat.issock != true
+
+- name: "Get file stat of HAProxy operator socket ..."
+  ansible.builtin.stat:
+    path: "{{ haproxy_operator_socket }}"
+  register: operator_socket
+
+- name: "File stat of HAProxy operator socket: "
+  debug:
+    var: operator_socket
+    verbosity: 3
+
+- name: "Check existence of HAProxy operator socket."
+  ansible.builtin.fail:
+    msg: "The HAProxy operator socket '{{ haproxy_operator_socket }}' does not exists."
+  when: operator_socket.stat.exists != true
+
+- name: "Checking, whether '{{ haproxy_operator_socket }}' is a socket."
+  ansible.builtin.fail:
+    msg: "The path '{{ haproxy_operator_socket }}' for the HAProxy operator socket is not a socket."
+  when: operator_socket.stat.issock != true
+
+- name: "Get file stat of HAProxy user socket ..."
+  ansible.builtin.stat:
+    path: "{{ haproxy_user_socket }}"
+  register: user_socket
+
+- name: "File stat of HAProxy user socket: "
+  debug:
+    var: user_socket
+    verbosity: 3
+
+- name: "Check existence of HAProxy user socket."
+  ansible.builtin.fail:
+    msg: "The HAProxy user socket '{{ haproxy_user_socket }}' does not exists."
+  when: user_socket.stat.exists != true
+
+- name: "Checking, whether '{{ haproxy_user_socket }}' is a socket."
+  ansible.builtin.fail:
+    msg: "The path '{{ haproxy_user_socket }}' for the HAProxy user socket is not a socket."
+  when: user_socket.stat.issock != true
+
 # vim: filetype=yaml

diff --git a/roles/haproxy-disable-backend/tasks/main.yaml b/roles/haproxy-disable-backend/tasks/main.yaml
index dd5b47dca15fc380e09347f265f900358726bccc..7955b1c7b17610f42bb06ab119ba17393b194dcf 100644 (file)
--- a/roles/haproxy-disable-backend/tasks/main.yaml
+++ b/roles/haproxy-disable-backend/tasks/main.yaml
@@ -4,26 +4,6 @@
     msg: "Setting server '{{ backend_server }}' on HAProxy backend '{{ backend }}' into maintenance ..."
     verbosity: 0
 
-- name: "Get file stat of HAProxy admin socket '{{ haproxy_admin_socket }}' ..."
-  ansible.builtin.stat:
-    path: "{{ haproxy_admin_socket }}"
-  register: admin_socket
-
-- name: "File stat of  HAProxy admin socket '{{ haproxy_admin_socket }}': "
-  debug:
-    var: admin_socket
-    verbosity: 3
-
-- name: "Check existence of HAProxy admin socket '{{ haproxy_admin_socket }}'."
-  ansible.builtin.fail:
-    msg: "The HAProxy admin socket '{{ haproxy_admin_socket }}' does not exists."
-  when: admin_socket.stat.exists != true
-
-- name: "Checkinf, whether '{{ haproxy_admin_socket }}' is a socket."
-  ansible.builtin.fail:
-    msg: "The path '{{ haproxy_admin_socket }}' for the HAProxy admin socket is not a socket."
-  when: admin_socket.stat.issock != true
-
 - name: "Setting backend server {{ backend }}/{{ backend_server }} into maintenance."
   community.general.haproxy:
     state: drain