Extract scripts copying into a role

We'll need it for more than just proposal jobs, but it's clearly very
project-config specific, so keep it here.

While refactoring that, consume add-sshkey from zuul-jobs.

Depends-On: I569b93ba0e775896b5a4f59b544fe32d1e2dce9b
Change-Id: I6b16acdcf55bcc6ff28ad496c044fe7db4599cd8
This commit is contained in:
Monty Taylor 2017-08-25 17:24:24 -05:00
parent abee455990
commit a2ccdf2d08
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
4 changed files with 20 additions and 14 deletions

View File

@ -1,13 +1,4 @@
- hosts: all
tasks:
- name: Copy the scripts directory to the remote node
synchronize:
# src is relative to the dir the playbook is in on the executor
src: ../../jenkins/scripts
dest: "{{ ansible_user_dir }}"
- name: Write out ssh key
file:
path: "~/.ssh/id_rsa"
content: "{{ proposal_ssh_key.private_key }}"
roles:
- legacy-copy-project-config-scripts
- add-sshkey

View File

@ -0,0 +1,6 @@
Copy project-config scripts directory to remote hosts
The scripts directory will be placed in the remote home directory.
.. note:: This role is deprecated and only exists for transition purposes.
It should not be used for new jobs.

View File

@ -0,0 +1,5 @@
- name: Copy the scripts directory to the remote node
synchronize:
# src is relative to the dir the playbook is in on the executor
src: ../../jenkins/scripts
dest: "{{ ansible_user_dir }}"

View File

@ -192,7 +192,8 @@
pre-run: playbooks/proposal/pre
run: playbooks/propose-updates
secrets:
- proposal_ssh_key
- secret: proposal_ssh_key
name: ssh_key
- job:
parent: propose-updates
@ -453,7 +454,10 @@
- secret:
name: proposal_ssh_key
data:
private_key: !encrypted/pkcs1-oaep
fqdn: review.openstack.org
ssh_known_hosts: |
review.openstack.org,23.253.232.87,2001:4800:7815:104:3bc3:d7f6:ff03:bf5d ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCfsIj/jqpI+2CFdjCL6kOiqdORWvxQ2sQbCzSzzmLXic8yVhCCbwarkvEpfUOHG4eyB0vqVZfMffxf0Yy3qjURrsroBCiuJ8GdiAcGdfYwHNfBI0cR6kydBZL537YDasIk0Z3ILzhwf7474LmkVzS7V2tMTb4ZiBS/jUeiHsVp88FZhIBkyhlb/awAGcUxT5U4QBXCAmerYXeB47FPuz9JFOVyF08LzH9JRe9tfXtqaCNhlSdRe/2pPRvn2EIhn5uHWwATACG9MBdrK8xv8LqPOik2w1JkgLWyBj11vDd5I3IjrmREGw8dqImqp0r6MD8rxqADlc1elfDIXYsy+TVH gerrit-code-review@gerrit.openstack.org
ssh_private_key: !encrypted/pkcs1-oaep
- ZtYinMMMMXChMzdA6ZPkt2sPmIEoumSAT6oD+Cc82b56Euv+mbetJRsDydH+PNRzLpzPB
DM8KuW2a9AsWutC/x/oCxtijmfUzUifCsUWUbBr9zVPhpIDcsw/BfyLCRIhW3/DUu1X8e
rFtClxs6DM19HIuuRJq9XD9PQ2o9CNM4tbdLNEFLOMlVqR0rwtJ/++ZaSdNLRtThINrCy