Merge pull request #37 from T-Systems-MMS/ipv6

add support for address6 on host object

Author: schurzi

examples/icinga_host.yml

@@ -8,6 +8,7 @@
     disabled: false
     object_name: "foohost"
     address: "127.0.0.1"
+    address6: "::1"
     display_name: "foohost"
     groups:
       - "foohostgroup"

plugins/modules/icinga_host.py

@@ -108,6 +108,11 @@
       - Host address. Usually an IPv4 address, but may be any kind of address your check plugin is able to deal with
     required: false
     type: str
+  address6:
+    description:
+      - Host IPv6 address. Usually an IPv6 address, but may be any kind of address your check plugin is able to deal with
+    required: false
+    type: str
   groups:
     description:
       - Hostgroups that should be directly assigned to this node. Hostgroups can be useful for various reasons.
@@ -158,6 +163,7 @@
     disabled: false
     object_name: "foohost"
     address: "127.0.0.1"
+    address6: "::1"
     display_name: "foohost"
     groups:
       - "foohostgroup"
@@ -193,6 +199,7 @@ def main():
         imports=dict(type="list", required=True),
         disabled=dict(type="bool", default=False, choices=[True, False]),
         address=dict(required=False),
+        address6=dict(required=False),
         zone=dict(required=False, default=None),
         vars=dict(type="dict", default=None),
         check_command=dict(required=False),
@@ -211,6 +218,7 @@ def main():
         "imports": module.params["imports"],
         "disabled": module.params["disabled"],
         "address": module.params["address"],
+        "address6": module.params["address6"],
         "zone": module.params["zone"],
         "vars": module.params["vars"],
         "check_command": module.params["check_command"],

plugins/modules/icinga_host_template.py

@@ -107,6 +107,11 @@
       - Host address. Usually an IPv4 address, but may be any kind of address your check plugin is able to deal with
     required: false
     type: str
+  address6:
+    description:
+      - Host IPv6 address. Usually an IPv64 address, but may be any kind of address your check plugin is able to deal with
+    required: false
+    type: str
   groups:
     description:
       - Hostgroups that should be directly assigned to this node. Hostgroups can be useful for various reasons.
@@ -190,6 +195,7 @@ def main():
         imports=dict(type="list", required=False),
         disabled=dict(type="bool", default=False, choices=[True, False]),
         address=dict(required=False),
+        address6=dict(required=False),
         zone=dict(required=False, default=None),
         vars=dict(type="dict", default=None),
     )
@@ -208,6 +214,7 @@ def main():
         "imports": module.params["imports"],
         "disabled": module.params["disabled"],
         "address": module.params["address"],
+        "address6": module.params["address6"],
         "zone": module.params["zone"],
         "vars": module.params["vars"],
     }

roles/ansible_icinga/README.md

@@ -64,6 +64,7 @@ t_systems_mms.icinga_director >= 1.2.2
 | icinga_host_templates      | no       | []
 | display_name               | no       |
 | address                    | no       |
+| address6                   | no       |
 | groups                     | no       |
 | check_command              | no       |
 | disabled                   | no       |
@@ -74,6 +75,7 @@ t_systems_mms.icinga_director >= 1.2.2
 | icinga_hosts               | no       | []
 | display_name               | no       |
 | address                    | no       |
+| address6                   | no       |
 | groups                     | no       |
 | disabled                   | no       |
 | imports                    | yes      | []

roles/ansible_icinga/tasks/icinga_host.yml

@@ -15,6 +15,7 @@
     object_name: "{{ host.1 }}"
     display_name: "{{ host.0.display_name | default(omit) }}"
     address: "{{ host.0.address | default(omit) }}"
+    address6: "{{ host.0.address6 | default(omit) }}"
     groups: "{{ host.0.groups | default(omit) }}"
     disabled: "{{ host.0.disabled | default(omit) }}"
     imports: "{{ host.0.imports | default(icinga_host_imports) }}"

roles/ansible_icinga/tasks/icinga_host_template.yml

@@ -15,6 +15,7 @@
     object_name: "{{ host_template.1 }}"
     display_name: "{{ host_template.0.display_name | default(omit) }}"
     address: "{{ host_template.0.address | default(omit) }}"
+    address6: "{{ host_template.0.address6 | default(omit) }}"
     groups: "{{ host_template.0.address | default(omit) }}"
     check_command: "{{ host_template.0.check_command | default(omit) }}"
     disabled: "{{ host_template.0.disabled | default(omit) }}"

tests/integration/targets/icinga/tasks/icinga_host.yml

@@ -8,6 +8,7 @@
     disabled: false
     object_name: "foohost"
     address: "127.0.0.1"
+    address6: "::1"
     display_name: "foohost"
     groups:
       - "foohostgroup"