Configure sshfs on buildvm-s390x-stg

This commit is contained in:
Mikolaj Izdebski
2018-03-01 00:44:14 +00:00
parent 8054c79719
commit 6ecfec3243
2 changed files with 8 additions and 8 deletions

View File

@@ -163,8 +163,8 @@
handlers:
- import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure sshfs on buildvm-s390x-01.s390.fedoraproject.org
hosts: buildvm-s390x-01.s390.fedoraproject.org
- name: configure sshfs on buildvm-s390x-01
hosts: buildvm-s390x-01.s390.fedoraproject.org:buildvm-s390x-01.stg.s390.fedoraproject.org
tags:
- sshfs
user: root
@@ -177,7 +177,7 @@
tasks:
- name: Put sshfs key in place
copy: src="{{ private }}/files/releng/sshkeys/primary-s390x-sshfs"
copy: src="{{ private }}/files/releng/sshkeys/primary-s390x-sshfs{{ '-staging' if env == 'staging' else '' }}"
dest="/etc/primary-s390x-sshfs"
owner=root group=root mode=0600
tags:
@@ -193,7 +193,7 @@
mount: path="/mnt/fedora_koji"
state=present
fstype=fuse.sshfs
src="root@koji01.phx2.fedoraproject.org:/mnt/fedora_koji"
src="root@koji01{{ env_suffix }}.phx2.fedoraproject.org:/mnt/fedora_koji"
opts="noauto,_netdev,ServerAliveInterval=20,IdentityFile=/etc/primary-s390x-sshfs"
tags:
- sshfs
@@ -202,7 +202,7 @@
- import_tasks: "{{ handlers_path }}/restart_services.yml"
- name: configure sshfs target on koji01
hosts: koji01.phx2.fedoraproject.org
hosts: koji01.phx2.fedoraproject.org:koji01.stg.phx2.fedoraproject.org
tags:
- sshfs
user: root
@@ -216,9 +216,9 @@
tasks:
- name: Put public sshfs key in place
authorized_key: user="root"
key="{{ lookup('file', '{{ private }}/files/releng/sshkeys/primary-s390x-sshfs.pub') }}"
key="{{ lookup('file', '{{ private }}/files/releng/sshkeys/primary-s390x-sshfs' + '-staging.pub' if env == 'staging' else '.pub') }}"
state=present
key_options='command="internal-sftp",from="10.16.0.11",restrict'
key_options='command="internal-sftp",from="{{ '10.16.0.25' if env == 'staging' else '10.16.0.11' }}",restrict'
tags:
- sshfs

View File

@@ -108,7 +108,7 @@
passno=0
dump=0
state=mounted
when: env == 'staging' and 'koji' in mnt_dir
when: env == 'staging' and 'koji' in mnt_dir and '.s390.' not in inventory_hostname
tags:
- nfs/client