From: David Galloway <dgallowa@redhat.com>
Date: Wed, 12 Aug 2020 18:11:20 +0000 (-0400)
Subject: ansible: Use JNLP for permanent.  SSH for ephemeral.
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1638%2Fhead;p=ceph-build.git

ansible: Use JNLP for permanent.  SSH for ephemeral.

Signed-off-by: David Galloway <dgallowa@redhat.com>
---

diff --git a/ansible/examples/slave.yml b/ansible/examples/slave.yml
index 11d6374bb..fd912a614 100644
--- a/ansible/examples/slave.yml
+++ b/ansible/examples/slave.yml
@@ -659,8 +659,8 @@
         executable: "{{ pip_version }}"
 
     ## JENKINS SLAVE AGENT TASKS
-    # We use jnlp on ephemeral non-permanent slaves because ???
-    - name: Register the new slave to jenkins master with jnlp
+    # We use SSH for ephemeral slaves
+    - name: Register ephemeral slave using SSH
       jenkins_node:
         username: "{{ api_user }}"
         uri: "{{ api_uri }}"
@@ -672,7 +672,6 @@
         labels: "{{ labels }}"
         host: "{{ ansible_default_ipv4.address }}"
         credentialsId: "{{ jenkins_credentials_uuid }}"
-        launcher: 'hudson.slaves.JNLPLauncher'
         remoteFS: '/home/{{ jenkins_user }}/build'
         executors: '{{ executors|default(1) }}'
         exclusive: true
@@ -680,7 +679,7 @@
 
     - name: Register Permanent Slave
       block:
-        - name: Register the new slave to jenkins master with ssh
+        - name: Register permenant slave using JNLP
           jenkins_node:
             username: "{{ api_user }}"
             uri: "{{ api_uri }}"
@@ -692,6 +691,7 @@
             labels: "{{ labels }}"
             host: "{{ ansible_default_ipv4.address }}"
             credentialsId: "{{ jenkins_credentials_uuid }}"
+            launcher: 'hudson.slaves.JNLPLauncher'
             remoteFS: '/home/{{ jenkins_user }}/build'
             executors: '{{ executors|default(1) }}'
             exclusive: true