Merge pull request #465 from Normo/internal-vars

GitLab role: Prefix all internal variables with '__'

Author: Normo

roles/gitlab/tasks/check.yml

@@ -7,16 +7,16 @@
 - name: "Check whether gitlab-rails binary is installed"
   ansible.builtin.stat:
     path: "/usr/bin/gitlab-rails"
-  register: "gitlab_rails_binary"
+  register: "__gitlab_rails_binary"
 
 - name: "Determine if this is an initial dry-run"
   ansible.builtin.set_fact:
-    gitlab_is_initial_dryrun: "{{ ansible_check_mode and not gitlab_rails_binary.stat.exists }}"
+    __gitlab_is_initial_dryrun: "{{ ansible_check_mode and not __gitlab_rails_binary.stat.exists }}"
 
 - name: "Check if a previous reconfigure had failed"
   ansible.builtin.stat:
     path: "/etc/gitlab/reconfigure_failed"
-  register: "gitlab_reconfigure_failed"
+  register: "__gitlab_reconfigure_failed"
 
 - name: "Check if registry configuration exists"
   ansible.builtin.set_fact:

roles/gitlab/tasks/feature-flag.yml

@@ -8,13 +8,13 @@
 - name: "Check if feature flag is already enabled for {{ gitlab_feature_flag.name }}"
   ansible.builtin.command:
     cmd: "gitlab-rails runner 'is_feature_enabled = Feature.enabled?(:{{ gitlab_feature_flag.name }}); puts is_feature_enabled'"
-  register: "gitlab_is_feature_enabled"
+  register: "__gitlab_is_feature_enabled"
   changed_when: false
 
 - name: "Enable or disable feature flag {{ gitlab_feature_flag.name }}"
   ansible.builtin.command:
     cmd: "gitlab-rails runner 'Feature.{{ 'enable' if gitlab_feature_flag.enabled else 'disable' }}(:{{ gitlab_feature_flag.name }})'"
   changed_when: true
-  when: "(gitlab_is_feature_enabled.stdout == 'true' and not gitlab_feature_flag.enabled) or (gitlab_is_feature_enabled.stdout == 'false' and gitlab_feature_flag.enabled)"
+  when: "(__gitlab_is_feature_enabled.stdout == 'true' and not gitlab_feature_flag.enabled) or (__gitlab_is_feature_enabled.stdout == 'false' and gitlab_feature_flag.enabled)"
 
 ...

roles/gitlab/tasks/install.yml

@@ -20,7 +20,7 @@
         url: "{{ gitlab_gpg_key_url }}"
         id: "{{ gitlab_gpg_key_id }}"
         state: "absent"
-      when: "not gitlab_is_initial_dryrun"
+      when: "not __gitlab_is_initial_dryrun"
 
     - name: "Remove GitLab APT repository from sources.list"
       ansible.builtin.apt_repository:
@@ -102,23 +102,23 @@
 - name: "Check if VERSION file exists"
   ansible.builtin.stat:
     path: "/var/opt/gitlab/gitlab-rails/VERSION"
-  register: "gitlab_version_file"
+  register: "__gitlab_version_file"
 
 - name: "Wait for background migrations on primary node"
   when:
     - "gitlab_is_primary"
-    - "gitlab_version_file.stat.exists"
-    - "gitlab_rails_binary.stat.exists"
-    - "gitlab_rails_binary.stat.executable"
+    - "__gitlab_version_file.stat.exists"
+    - "__gitlab_rails_binary.stat.exists"
+    - "__gitlab_rails_binary.stat.executable"
   block:
     - name: "Get the currently installed GitLab version"
       ansible.builtin.slurp:
         path: "/var/opt/gitlab/gitlab-rails/VERSION"
-      register: "gitlab_version_base64"
+      register: "__gitlab_version_base64"
 
     - name: "Set fact about installed GitLab version"
       ansible.builtin.set_fact:
-        gitlab_installed_version: "{{ gitlab_version_base64['content'] | b64decode }}"
+        __gitlab_installed_version: "{{ __gitlab_version_base64['content'] | b64decode }}"
       check_mode: false
 
     - name: "Wait until all previous background migrations are processed."
@@ -131,7 +131,7 @@
       delay: 10
       check_mode: false
       changed_when: false
-      when: "gitlab_version == '' or gitlab_installed_version is version(gitlab_version, operator='lt', strict=True)"
+      when: "gitlab_version == '' or __gitlab_installed_version is version(gitlab_version, operator='lt', strict=True)"
 
 - name: "Install GitLab and add helper to detect failed reconfigures"
   block:
@@ -141,9 +141,8 @@
       ansible.builtin.package:
         name: "{{ gitlab_package_name }}"
         state: "{{ 'present' if gitlab_version | length > 0 else 'latest' }}"
-      register: "gitlab_install_output"
       notify: "GitLab has been installed or upgraded"
-      when: "not gitlab_is_initial_dryrun"
+      when: "not __gitlab_is_initial_dryrun"
 
   rescue:
 

roles/gitlab/tasks/main.yml

@@ -14,7 +14,7 @@
 - name: "Reconfigure GitLab"
   ansible.builtin.import_tasks: "reconfigure.yml"
   become: true
-  when: "gitlab_reconfigure_failed.stat.exists"
+  when: "__gitlab_reconfigure_failed.stat.exists"
 
 - name: "Install GitLab"
   ansible.builtin.import_tasks: "install.yml"
@@ -27,11 +27,13 @@
 - name: "Check if GitLab is already configured"
   ansible.builtin.stat:
     path: "/opt/gitlab/etc/gitlab-rails-rc"
-  register: "gitlab_rails_rc"
+  register: "__gitlab_rails_rc"
 
 - name: "Force all notified handlers to run at this point. Required for feature flags."
   ansible.builtin.meta: "flush_handlers"
-  when: "not gitlab_rails_rc.stat.exists and gitlab_feature_flags | length > 0"
+  when:
+    - "not __gitlab_rails_rc.stat.exists"
+    - "gitlab_feature_flags | length > 0"
 
 - name: "Set feature flags"
   ansible.builtin.include_tasks: "feature-flag.yml"