[icinga-checkins] icinga.org: icinga2-ansible/master: ansible_ssh_port has been deprecated starting from Ansible 2.0

git at icinga.org git at icinga.org
Mon Feb 22 11:12:51 CET 2016


Module: icinga2-ansible
Branch: master
Commit: 3584f1e320480112843518f29cfdccc30663b3e2
URL:    https://git.icinga.org/?p=icinga2-ansible.git;a=commit;h=3584f1e320480112843518f29cfdccc30663b3e2

Author: Valentino Gagliardi <valentino.g at servermanaged.it>
Date:   Mon Feb 22 11:10:50 2016 +0100

ansible_ssh_port has been deprecated starting from Ansible 2.0

---

 icinga2-ansible-add-hosts/templates/object_logic.j2 |    1 -
 icinga2-nrpe-agent/README.md                        |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/icinga2-ansible-add-hosts/templates/object_logic.j2 b/icinga2-ansible-add-hosts/templates/object_logic.j2
index dbc793d..a4748dd 100644
--- a/icinga2-ansible-add-hosts/templates/object_logic.j2
+++ b/icinga2-ansible-add-hosts/templates/object_logic.j2
@@ -5,7 +5,6 @@ object Host "{{ hostvars[item]['ansible_fqdn'] }}" {
   address = "{{ hostvars[item]['ansible_default_ipv4']['address'] }}"
   vars.os = "{{ hostvars[item]['ansible_system'] }}"
   vars.os_family = "{{ hostvars[item]['ansible_os_family'] }}"
-  vars.ssh_port = "{{ hostvars[item]['ansible_ssh_port'] }}"
 
   # Here Goes Vars and check_command
   {{ host_attributes }}
diff --git a/icinga2-nrpe-agent/README.md b/icinga2-nrpe-agent/README.md
index 47be91e..651a03b 100644
--- a/icinga2-nrpe-agent/README.md
+++ b/icinga2-nrpe-agent/README.md
@@ -34,7 +34,7 @@ Example Playbook
        connection_timeout=150
      nrpe_check_commands: |
        command[check_load]={{ nrpe_agent_plugins_x86_64 }}/check_load -w 15,10,8 -c 30,25,15
-       command[check_ssh]={{ nrpe_agent_plugins_x86_64 }}/check_ssh -H {{ ansible_eth0.ipv4.address }} -p {{ ansible_ssh_port }}
+       command[check_ssh]={{ nrpe_agent_plugins_x86_64 }}/check_ssh -H {{ ansible_eth0.ipv4.address }} -p {{ ansible_port }}
        command[check_procs]={{ nrpe_agent_plugins_x86_64 }}/check_procs -w 300 -c 500
        command[check_disk]={{ nrpe_agent_plugins_x86_64 }}/check_disk -w 15% -c 10% -p / -p /home -p /tmp
      tags: nrpe-agent



More information about the icinga-checkins mailing list