Skip to content

Commit

Permalink
ansible-scylla-monitoring: Rename install_type to monitoring_install_…
Browse files Browse the repository at this point in the history
…type

Let's also rename the install_type from monitoring to avoid conflicts.
  • Loading branch information
igorribeiroduarte committed Jul 2, 2024
1 parent c3617eb commit fb2830a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion ansible-scylla-monitoring/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
2 changes: 1 addition & 1 deletion ansible-scylla-monitoring/tasks/Debian.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,4 +70,4 @@
state: started
enabled: yes
become: true
when: install_type == "docker"
when: monitoring_install_type == "docker"
4 changes: 2 additions & 2 deletions ansible-scylla-monitoring/tasks/RedHat.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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



Expand Down
4 changes: 2 additions & 2 deletions ansible-scylla-monitoring/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'

0 comments on commit fb2830a

Please sign in to comment.