ansible: slave config updates

Update the URL for our new production Jenkins instance

Use the dedicated "prado" UID to join the systems to Jenkins

Use the new SSH key credentialId for our new production Jenkins instance

diff --git a/ansible/slave.yml b/ansible/slave.yml
index 2f1455295865ff33355e54c6f0dd1561aeb8e6c6..bb1b640fc92b62aa80f2c9484fc818143b8e820f 100644 (file)
--- a/ansible/slave.yml
+++ b/ansible/slave.yml
@@ -77,5 +77,5 @@
         name: "{{ nodename }}+{{ ansible_default_ipv4.address }}"
         labels: "{{ labels }}"
         host: "{{ ansible_default_ipv4.address }}"
-        credentialsId: 'c7098414-e0ba-4d97-892e-7122e01be8a8'
+        credentialsId: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
         remoteFS: '/home/jenkins-build/build'

diff --git a/ansible/slave.yml.j2 b/ansible/slave.yml.j2
index 2d6d8e40ddc8ba8c7f2818a6a17290441bae0d6b..aa92e062a88b28a918f0fed0d412c158a64e1f85 100644 (file)
--- a/ansible/slave.yml.j2
+++ b/ansible/slave.yml.j2
@@ -6,9 +6,9 @@
   vars:
    - jenkins_user: 'jenkins-build'
    # jenkins API credentials:
-   - api_user: 'alfredodeza'
+   - api_user: 'prado'
    - token: '${token}'
-   - api_uri: 'http://staging-jenkins.ceph.com'
+   - api_uri: 'https://jenkins.ceph.com'
    - nodename: '${nodename}'
    - labels: '${labels}'
   tasks:
@@ -120,5 +120,5 @@
         name: "{{ nodename }}+{{ ansible_default_ipv4.address }}"
         labels: "{{ labels }}"
         host: "{{ ansible_default_ipv4.address }}"
-        credentialsId: 'c7098414-e0ba-4d97-892e-7122e01be8a8'
+        credentialsId: '39fa150b-b2a1-416e-b334-29a9a2c0b32d'
         remoteFS: '/home/jenkins-build/build'