slap the hosts IP to the name when registering them in Jenkins

Signed-off-by: Alfredo Deza <adeza@redhat.com>

diff --git a/ansible/slave.yml b/ansible/slave.yml
index 9f38d5b63690d76667c8b76e8ea372342bbcf080..37ddd41dad5e52da073383f3423ac760a1b1b8eb 100644 (file)
--- a/ansible/slave.yml
+++ b/ansible/slave.yml
@@ -91,7 +91,10 @@
         username: "{{ api_user }}"
         uri: "{{ api_uri }}"
         password: "{{ token }}"
-        name: "{{ nodename }}"
+        # relies on a convention to set a unique name that allows a reverse
+        # mapping from Jenkins back to whatever service created the current
+        # node
+        name: "{{ nodename }}+{{ ansible_default_ipv4.address }}"
         labels: "{{ labels }}"
         host: "{{ ansible_default_ipv4.address }}"
         credentialsId: 'c7098414-e0ba-4d97-892e-7122e01be8a8'

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 294912e12d17ac329afc1ff2bb6657e822935419..62643c14fb61ece8faceb37e3e0192f5fa225cb5 100644 (file)
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -139,7 +139,10 @@
         username: "{{ api_user }}"
         uri: "{{ api_uri }}"
         password: "{{ token }}"
-        name: "{{ nodename }}"
+        # relies on a convention to set a unique name that allows a reverse
+        # mapping from Jenkins back to whatever service created the current
+        # node
+        name: "{{ nodename }}+{{ ansible_default_ipv4.address }}"
         labels: "{{ labels }}"
         host: "{{ ansible_default_ipv4.address }}"
         credentialsId: 'c7098414-e0ba-4d97-892e-7122e01be8a8'