diff --git a/group_vars/virtu.yml b/group_vars/virtu.yml index b999a5044966eb1fc99f408cd90a723052a2f927..f97bbfe8886e083fbe403f9ab9cd134a1f70dc3f 100644 --- a/group_vars/virtu.yml +++ b/group_vars/virtu.yml @@ -1,4 +1,5 @@ --- glob_debian_images: cron_timer: '39 06 * * *' - rsync_host: "eclat.adm.crans.org" + rsync_host: 'eclat.adm.crans.org' + rsync_module: 'mirror' diff --git a/host_vars/gulp.cachan-adm.crans.org.yml b/host_vars/gulp.cachan-adm.crans.org.yml index b44167aed19b484acaba8d558c2a6d9c2b2cb470..ce3a5eb00fe04d5e4cf59709d5d407894ea58054 100644 --- a/host_vars/gulp.cachan-adm.crans.org.yml +++ b/host_vars/gulp.cachan-adm.crans.org.yml @@ -13,6 +13,7 @@ proxmox_mirror: http://mirror.cachan-adm.crans.org/proxmox/debian/pve loc_debian_images: rsync_host: 'mirror.cachan-adm.crans.org' + rsync_module: 'ftp' loc_postgres: subnets: diff --git a/roles/proxmox-debian-images/tasks/main.yml b/roles/proxmox-debian-images/tasks/main.yml index a21c22ff5236ab54b325cfc378bbf663bf87c965..043d6008309139d44ea690a5904124c818125bb9 100644 --- a/roles/proxmox-debian-images/tasks/main.yml +++ b/roles/proxmox-debian-images/tasks/main.yml @@ -13,6 +13,6 @@ until: apt_result is succeeded - name: Initial synchronization to download Debian images - shell: "rsync --verbose --dirs --compress --times --update --delete-after --delete-excluded --include 'debian-[0-9]*-amd64-netinst.iso' --exclude '*' rsync://eclat.adm.crans.org/mirror/cdimage-debian/release/current/amd64/iso-cd/ /var/lib/vz/template/iso/" + shell: "rsync --verbose --dirs --compress --times --update --delete-after --delete-excluded --include 'debian-[0-9]*-amd64-netinst.iso' --exclude '*' rsync://{{ debian_images.rsync_host }}/{{ debian_images.rsync_module }}/cdimage-debian/release/current/amd64/iso-cd/ /var/lib/vz/template/iso/" register: rsync_output changed_when: '"debian" in rsync_output.stdout' diff --git a/roles/proxmox-debian-images/templates/cron.d/debian-images.j2 b/roles/proxmox-debian-images/templates/cron.d/debian-images.j2 index bec7e9f6a060faa222cf9d18515e446a4d3ce6ea..955a36f2a9e8bb9026ea64fbbda2881f1811fb83 100644 --- a/roles/proxmox-debian-images/templates/cron.d/debian-images.j2 +++ b/roles/proxmox-debian-images/templates/cron.d/debian-images.j2 @@ -1,3 +1,3 @@ {{ ansible_header | comment }} -{{ debian_images.cron_timer }} root rsync --info=name1 --dirs --compress --times --update --delete-after --delete-excluded --include 'debian-[0-9]*-amd64-netinst.iso' --exclude '*' rsync://{{ debian_images.rsync_host }}/mirror/cdimage-debian/release/current/amd64/iso-cd/ /var/lib/vz/template/iso/ +{{ debian_images.cron_timer }} root rsync --info=name1 --dirs --compress --times --update --delete-after --delete-excluded --include 'debian-[0-9]*-amd64-netinst.iso' --exclude '*' rsync://{{ debian_images.rsync_host }}/{{ debian_images.rsync_module }}/cdimage-debian/release/current/amd64/iso-cd/ /var/lib/vz/template/iso/