Merge branch 'master' of /git/ansible
This commit is contained in:
commit
f0a8cd0378
1 changed files with 11 additions and 11 deletions
|
@ -43,14 +43,14 @@
|
||||||
roles:
|
roles:
|
||||||
- { role: openqa/server, tags: ['openqa_server'] }
|
- { role: openqa/server, tags: ['openqa_server'] }
|
||||||
- { role: openqa/dispatcher, tags: ['openqa_dispatcher'] }
|
- { role: openqa/dispatcher, tags: ['openqa_dispatcher'] }
|
||||||
- { role: fedmsg/hub, tags: ['fedmsg_hub'] }
|
|
||||||
- { role: check-compose, tags: ['check-compose'] }
|
- { role: check-compose, tags: ['check-compose'] }
|
||||||
|
- { role: fedmsg/base, tags: ['fedmsg_hub'] }
|
||||||
|
- { role: fedmsg/hub, tags: ['fedmsg_hub'] }
|
||||||
|
|
||||||
handlers:
|
handlers:
|
||||||
- include: "{{ handlers }}/restart_services.yml"
|
- include: "{{ handlers }}/restart_services.yml"
|
||||||
|
|
||||||
# for now just stg while we're testing
|
- name: set up openQA server data NFS mounts (staging)
|
||||||
- name: set up openQA server data NFS mounts
|
|
||||||
hosts: openqa-stg
|
hosts: openqa-stg
|
||||||
roles:
|
roles:
|
||||||
- role: nfs/client
|
- role: nfs/client
|
||||||
|
@ -58,22 +58,22 @@
|
||||||
nfs_src_dir: 'fedora_openqa_stg/testresults'
|
nfs_src_dir: 'fedora_openqa_stg/testresults'
|
||||||
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
||||||
tags: ['nfs_client']
|
tags: ['nfs_client']
|
||||||
|
|
||||||
- name: set up openQA server data NFS mounts
|
|
||||||
hosts: openqa-stg
|
|
||||||
roles:
|
|
||||||
- role: nfs/client
|
- role: nfs/client
|
||||||
mnt_dir: '/var/lib/openqa/images'
|
mnt_dir: '/var/lib/openqa/images'
|
||||||
nfs_src_dir: 'fedora_openqa_stg/images'
|
nfs_src_dir: 'fedora_openqa_stg/images'
|
||||||
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
||||||
tags: ['nfs_client']
|
tags: ['nfs_client']
|
||||||
|
|
||||||
# set up prod temp mount
|
- name: set up openQA server data NFS mounts (prod)
|
||||||
- name: set up openQA server data NFS mounts
|
|
||||||
hosts: openqa
|
hosts: openqa
|
||||||
roles:
|
roles:
|
||||||
- role: nfs/client
|
- role: nfs/client
|
||||||
mnt_dir: '/mnt/temp'
|
mnt_dir: '/var/lib/openqa/testresults'
|
||||||
nfs_src_dir: 'fedora_openqa'
|
nfs_src_dir: 'fedora_openqa/testresults'
|
||||||
|
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
||||||
|
tags: ['nfs_client']
|
||||||
|
- role: nfs/client
|
||||||
|
mnt_dir: '/var/lib/openqa/images'
|
||||||
|
nfs_src_dir: 'fedora_openqa/images'
|
||||||
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
nfs_mount_opts: 'rw,bg,nfsvers=3'
|
||||||
tags: ['nfs_client']
|
tags: ['nfs_client']
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue