Merge pull request #468 from Normo/haproxy-internal-vars

haproxy role: prefix all internal variables with two underscores

Author: Normo

roles/haproxy/handlers/main.yml

@@ -8,22 +8,22 @@
 - name: "Check HAProxy configuration file"
   ansible.builtin.command:
     cmd: "{{ haproxy_executable_path }} -c -q -f {{ haproxy_conf_file_path }}"
-  register: "check_haproxy_config"
-  changed_when: "check_haproxy_config.rc != 0"
-  failed_when: "check_haproxy_config.rc != 0"
+  register: "__check_haproxy_config"
+  changed_when: false
+  failed_when: "__check_haproxy_config.rc != 0"
 
 - name: "Restart HAProxy"
   become: true
   ansible.builtin.service:
     name: "{{ haproxy_name }}"
     state: "restarted"
-  ignore_errors: "{{ ignore_errors_in_check_mode }}"  # noqa ignore-errors
+  ignore_errors: "{{ __ignore_errors_in_check_mode }}"  # noqa ignore-errors
 
 - name: "Reload HAProxy"
   become: true
   ansible.builtin.service:
     name: "{{ haproxy_name }}"
     state: "reloaded"
-  ignore_errors: "{{ ignore_errors_in_check_mode }}"  # noqa ignore-errors
+  ignore_errors: "{{ __ignore_errors_in_check_mode }}"  # noqa ignore-errors
 
 ...

roles/haproxy/tasks/main.yml

@@ -64,7 +64,7 @@
     signed_by: "https://haproxy.debian.net/bernat.debian.org.gpg"
     state: "present"
     enabled: true
-  register: "deb_repo"
+  register: "__deb_repo"
 
 - name: "Add PPA for HAProxy"
   when:
@@ -76,54 +76,57 @@
     state: "present"
     validate_certs: true
     mode: "0644"
-  register: "ppa"
+  register: "__ppa"
 
 - name: "Check whether wildcard character is contained in version string."
   ansible.builtin.set_fact:
-    version_contains_wildcard: "{{ '*' in haproxy_version }}"
+    __version_contains_wildcard: "{{ '*' in haproxy_version }}"
 
 - name: "Check whether HAProxy binary is installed."
   ansible.builtin.stat:
     path: "{{ haproxy_executable_path }}"
-  register: "haproxy_installed"
+  register: "__haproxy_binary"
 
 - name: "Check currently installed HAProxy version"
-  when: "not version_contains_wildcard and haproxy_installed.stat.exists"
+  when:
+    - "not __version_contains_wildcard"
+    - "__haproxy_binary.stat.exists"
   block:
     - name: "Get HAProxy version."
       ansible.builtin.command:
         cmd: "{{ haproxy_executable_path }} -v"
-      register: "haproxy_version_installed"
+      register: "__haproxy_version_installed"
       changed_when: false
       check_mode: false
 
     - name: "Extract installed and target HAProxy versions."
       ansible.builtin.set_fact:
-        installed_version: "{{ haproxy_version_installed |
+        __installed_version: "{{ __haproxy_version_installed |
                                regex_search('HA-?Proxy version (\\d+\\.\\d+\\.\\d+)', '\\1') |
                                default([None], True) |
                                first }}"
-        target_version: "{{ haproxy_version |
+        __target_version: "{{ haproxy_version |
                             regex_search('^(\\d+\\.\\d+\\.\\d+)', '\\1') |
                             default([None], True) |
                             first }}"
 
 - name: "Determine if errors in check mode can be ignored"
   ansible.builtin.set_fact:
-    ignore_errors_in_check_mode: "{{ ansible_check_mode and (ppa.changed or deb_repo.changed) }}"
+    __ignore_errors_in_check_mode: "{{ ansible_check_mode and (__ppa.changed or __deb_repo.changed) }}"
 
 - name: "Install and configure HAProxy"
-  ignore_errors: "{{ ignore_errors_in_check_mode }}"  # noqa ignore-errors
+  ignore_errors: "{{ __ignore_errors_in_check_mode }}"  # noqa ignore-errors
   block:
 
     - name: "Install or upgrade haproxy package."
       become: true
       ansible.builtin.package:
         name: "{{ haproxy_name }}={{ haproxy_version }}"
         update_cache: true
-      when: "version_contains_wildcard or
-            not haproxy_installed.stat.exists or
-            installed_version is version(target_version, operator='lt', strict=True)"
+      when: >-
+        __version_contains_wildcard or
+        not __haproxy_binary.stat.exists or
+        __installed_version is version(__target_version, operator='lt', strict=True)
 
     - name: "Create HAProxy Configuration Directory."
       become: true
@@ -157,7 +160,7 @@
 
 - name: "Generate self-signed TLS certificate"
   when: "haproxy_create_self_signed_cert | bool"
-  ignore_errors: "{{ ignore_errors_in_check_mode }}"  # noqa ignore-errors
+  ignore_errors: "{{ __ignore_errors_in_check_mode }}"  # noqa ignore-errors
   block:
     - name: "Generate an OpenSSL Private Key (4096 bits)"
       become: true
@@ -227,7 +230,7 @@
     - "Reload HAProxy"
 
 - name: "Generate DH Parameter file"
-  ignore_errors: "{{ ignore_errors_in_check_mode }}"  # noqa ignore-errors
+  ignore_errors: "{{ __ignore_errors_in_check_mode }}"  # noqa ignore-errors
   become: true
   community.crypto.openssl_dhparam:
     path: "{{ haproxy_ssl_dhparam_file }}"