diff --git a/defaults/main.yaml b/defaults/main.yaml index 5c89899..c1f88ea 100644 --- a/defaults/main.yaml +++ b/defaults/main.yaml @@ -3,7 +3,7 @@ consul_config_path: "/etc/consul.d" consul_data_path: "/opt/consul" consul_user: "consul" consul_group: "consul" -consul_install_repo: true +consul_install_official_repo: true consul_cluster_group: "consul" consul_server_group: "consul_server" diff --git a/tasks/Debian/main.yaml b/tasks/Debian/main.yaml index 3bcf440..261f93f 100644 --- a/tasks/Debian/main.yaml +++ b/tasks/Debian/main.yaml @@ -7,7 +7,7 @@ ansible.builtin.apt_key: url: "{{ item.url }}" keyring: "{{ item.keyring }}" - when: consul_install_repo + when: consul_install_official_repo loop: "{{ consul_apt_key }}" - name: Add Hashicorp repository @@ -16,7 +16,7 @@ state: present filename: "{{ item.filename }}" update_cache: yes - when: consul_install_repo + when: consul_install_official_repo loop: "{{ consul_apt_repository }}" - name: Gather packages diff --git a/tasks/RedHat/main.yaml b/tasks/RedHat/main.yaml index ce2f014..d970a7e 100644 --- a/tasks/RedHat/main.yaml +++ b/tasks/RedHat/main.yaml @@ -7,7 +7,7 @@ enabled: yes gpgcheck: yes gpgkey: https://rpm.releases.hashicorp.com/gpg - when: consul_install_repo + when: consul_install_official_repo - name: "Install {{ consul_package_name }}-{{ consul_version }} from official repository" dnf: @@ -18,7 +18,7 @@ update_cache: yes disablerepo: '*' register: consul_setup - when: consul_install_repo + when: consul_install_official_repo - name: "Install {{ consul_package_name }}-{{ consul_version }}" dnf: @@ -26,7 +26,7 @@ state: present disable_gpg_check: yes register: consul_setup - when: not consul_install_repo + when: not consul_install_official_repo - name: Fix "/etc/consul.d/consul.env" copy: