From 6ecfec32432d83317cf7e7d49fb4896f5bfbd57d Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Thu, 1 Mar 2018 00:44:14 +0000 Subject: [PATCH] Configure sshfs on buildvm-s390x-stg --- playbooks/groups/buildvm.yml | 14 +++++++------- roles/nfs/client/tasks/main.yml | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 99a46f1ecf..8089d163a9 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -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 diff --git a/roles/nfs/client/tasks/main.yml b/roles/nfs/client/tasks/main.yml index ab890b94a9..e0a24a31cd 100644 --- a/roles/nfs/client/tasks/main.yml +++ b/roles/nfs/client/tasks/main.yml @@ -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