From fb2830aea751507d6da6dc9eb47bc68850ceb25a Mon Sep 17 00:00:00 2001 From: Igor Ribeiro Barbosa Duarte Date: Tue, 2 Jul 2024 09:17:01 -0300 Subject: [PATCH] ansible-scylla-monitoring: Rename install_type to monitoring_install_type Let's also rename the install_type from monitoring to avoid conflicts. --- ansible-scylla-monitoring/defaults/main.yml | 2 +- ansible-scylla-monitoring/tasks/Debian.yml | 2 +- ansible-scylla-monitoring/tasks/RedHat.yml | 4 ++-- ansible-scylla-monitoring/tasks/main.yml | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ansible-scylla-monitoring/defaults/main.yml b/ansible-scylla-monitoring/defaults/main.yml index 0dca6e84..6e91d9ee 100644 --- a/ansible-scylla-monitoring/defaults/main.yml +++ b/ansible-scylla-monitoring/defaults/main.yml @@ -3,7 +3,7 @@ # Set this to "nondocker" for a flat installation or "docker" for the dockerized install (recommended) # Default and recommended install is via docker -install_type: 'docker' +monitoring_install_type: 'docker' # In some rare scenarios, it is impossible to run docker containers as a regular user. Set this to True if you need # to use `sudo` diff --git a/ansible-scylla-monitoring/tasks/Debian.yml b/ansible-scylla-monitoring/tasks/Debian.yml index d751c4be..db749edf 100644 --- a/ansible-scylla-monitoring/tasks/Debian.yml +++ b/ansible-scylla-monitoring/tasks/Debian.yml @@ -70,4 +70,4 @@ state: started enabled: yes become: true - when: install_type == "docker" + when: monitoring_install_type == "docker" diff --git a/ansible-scylla-monitoring/tasks/RedHat.yml b/ansible-scylla-monitoring/tasks/RedHat.yml index 8a2a805a..614ba301 100644 --- a/ansible-scylla-monitoring/tasks/RedHat.yml +++ b/ansible-scylla-monitoring/tasks/RedHat.yml @@ -79,7 +79,7 @@ state: started enabled: yes become: true - when: install_type == "docker" #and ansible_distribution_major_version|int == 7 + when: monitoring_install_type == "docker" #and ansible_distribution_major_version|int == 7 # - name: run docker related tasks for EL8 # block: @@ -92,7 +92,7 @@ # shell: | # touch /etc/containers/nodocker # become: true -# when: install_type == "docker" and ansible_distribution_major_version|int > 7 +# when: monitoring_install_type == "docker" and ansible_distribution_major_version|int > 7 diff --git a/ansible-scylla-monitoring/tasks/main.yml b/ansible-scylla-monitoring/tasks/main.yml index 270e54a9..116b28e5 100644 --- a/ansible-scylla-monitoring/tasks/main.yml +++ b/ansible-scylla-monitoring/tasks/main.yml @@ -10,8 +10,8 @@ - name: install dockerized monitoring include_tasks: docker.yml - when: install_type == 'docker' + when: monitoring_install_type == 'docker' - name: install non-dockerized monitoring include_tasks: non-docker.yml - when: install_type != 'docker' + when: monitoring_install_type != 'docker'