Merge "Update base-test to use site_logs secret"

playbooks/base-test/post-logs.yaml

@@ -1,25 +1,15 @@
 - hosts: localhost
-  tasks:
-    - name: Add log server ssh key
-      command: ssh-add /var/lib/zuul/ssh/static_id_rsa
-
-    - name: Add log server to inventory
-      add_host:
-        name: static.openstack.org
-        groups: zuul_logserver
-        ansible_user: jenkins
-
-    - name: Add log server to known hosts
-      known_hosts:
-        name: static.openstack.org
-        key: static.openstack.org,23.253.108.137,2001:4800:7817:104:be76:4eff:fe05:dbee ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDcvLuGLagUAZfc0BThLus8ufSPCrIhDtG0BdXvhblJjvIbkuELD3dRWRZVSYZAdzGZRY3t6vTAcguTrkbQg5ngXfdfF+OKPkaH8DiZwAX/1g/iRXhInkZTGBVqHo9pLAMeNNwviSy2JjpTqdD6fLEkHwW+uw4E2YZhYivctTSbOepMkzAtFV0w5cpyBzjAT/Hax2x5un6es8R0Iw3AAnUmtapn5e5NCrg2rPNpd0nve84wUavvbC2DeGDOZQdnIahwo60Sder5ZE/x6cG39bkSDdgFQArAzrNrH6BHmNGjfFPpnGmfc7P8gQwDPtMf02HvKapqATXpIxdbSGimWLL
+  roles:
+    - add-fileserver:
+      fileserver: "{{ site_logs }}"
 
+  post_tasks:
     - name: Copy inventory to logs dir
       copy:
         src: "{{ inventory_file }}"
         dest: "{{ zuul.executor.log_root  }}"
 
-- hosts: zuul_logserver
+- hosts: "{{ site_logs.fqdn }}"
   roles:
     - upload-logs
 

zuul.yaml

@@ -149,6 +149,8 @@
     nodes:
       - name: ubuntu-xenial
         label: ubuntu-xenial
+    secrets:
+      - site_logs
 
 - job:
     name: publish-openstack-tarball
@@ -195,6 +197,86 @@
           A55ES2jKpwFCottqtgiZSO4n0+0TmjsVwYPwKbyxYEvmxkeldRFwKSz8T3EpV2HQi++aT
           aR6LCLkViHsSTluDbv5dJESSQDVjyXyd3gp4jTvXmHlSxSenfSbyV7Rqkia0tk=
 
+- secret:
+    name: site_logs
+    data:
+      fqdn: static.openstack.org
+      path: /srv/static/logs
+      ssh_known_hosts: |
+          static.openstack.org,23.253.108.137,2001:4800:7817:104:be76:4eff:fe05:dbee ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDDcvLuGLagUAZfc0BThLus8ufSPCrIhDtG0BdXvhblJjvIbkuELD3dRWRZVSYZAdzGZRY3t6vTAcguTrkbQg5ngXfdfF+OKPkaH8DiZwAX/1g/iRXhInkZTGBVqHo9pLAMeNNwviSy2JjpTqdD6fLEkHwW+uw4E2YZhYivctTSbOepMkzAtFV0w5cpyBzjAT/Hax2x5un6es8R0Iw3AAnUmtapn5e5NCrg2rPNpd0nve84wUavvbC2DeGDOZQdnIahwo60Sder5ZE/x6cG39bkSDdgFQArAzrNrH6BHmNGjfFPpnGmfc7P8gQwDPtMf02HvKapqATXpIxdbSGimWLL
+      ssh_username: jenkins
+      ssh_private_key: !encrypted/pkcs1-oaep
+        - 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
+
 - secret:
     name: site_zuulv3_dev
     data: