diff --git a/hosts b/hosts index b43c59b..1716e24 100644 --- a/hosts +++ b/hosts @@ -2,4 +2,4 @@ host_key_checking=false [server] -10.0.0.1 ansible_ssh_user=amgmt +192.168.0.1 ansible_ssh_user=amgmt diff --git a/roles/pxe/tasks/tftp-ks.yml b/roles/pxe/tasks/tftp-ks.yml index 32d7025..e68d602 100644 --- a/roles/pxe/tasks/tftp-ks.yml +++ b/roles/pxe/tasks/tftp-ks.yml @@ -4,17 +4,18 @@ - name: Verifica configurazione tftp shell: /sbin/e-smith/db configuration getprop dnsmasq dhcp-boot register: chk_tftp_enabled + changed_when: "'pxelinux.0' not in chk_tftp_enabled.stdout" ignore_errors: yes sudo: yes - name: Configuro tftp shell: /sbin/e-smith/db configuration setprop dnsmasq tftp-status enabled dhcp-boot pxelinux.0 - when: chk_tftp_enabled|failed + when: chk_tftp_enabled|changed sudo: yes - name: Attivo tftp shell: /sbin/e-smith/signal-event nethserver-dnsmasq-save - when: chk_tftp_enabled|failed + when: chk_tftp_enabled|changed sudo: yes - name: Verifica configurazione ibay kickstart diff --git a/roles/pxe/templates/ks/edubuntu-trusty.cfg b/roles/pxe/templates/ks/edubuntu-trusty.cfg index af0f746..77085de 100644 --- a/roles/pxe/templates/ks/edubuntu-trusty.cfg +++ b/roles/pxe/templates/ks/edubuntu-trusty.cfg @@ -20,7 +20,7 @@ text install #Use Web installation #url --url http://archive.ubuntu.com/ubuntu -url --url http://{{ mirrorpath }}archive.ubuntu.com/ubuntu +url --url http://{{ mirrorpath }}it.archive.ubuntu.com/ubuntu #System bootloader configuration bootloader --location=mbr #Clear the Master Boot Record diff --git a/roles/pxe/templates/ks/ubuntu-trusty.cfg b/roles/pxe/templates/ks/ubuntu-trusty.cfg index fd24aab..263235e 100644 --- a/roles/pxe/templates/ks/ubuntu-trusty.cfg +++ b/roles/pxe/templates/ks/ubuntu-trusty.cfg @@ -20,7 +20,7 @@ text install #Use Web installation #url --url http://archive.ubuntu.com/ubuntu -url --url http://{{ mirrorpath }}archive.ubuntu.com/ubuntu +url --url http://{{ mirrorpath }}it.archive.ubuntu.com/ubuntu #System bootloader configuration bootloader --location=mbr #Clear the Master Boot Record diff --git a/roles/pxe/templates/pxelinux.cfg/default b/roles/pxe/templates/pxelinux.cfg/default index 59248dc..717057e 100644 --- a/roles/pxe/templates/pxelinux.cfg/default +++ b/roles/pxe/templates/pxelinux.cfg/default @@ -1,19 +1,19 @@ -UI utils/vesamenu.c32 +UI /utils/vesamenu.c32 DEFAULT edu64 TIMEOUT 30 MENU TITLE BgLUG PXE Boot -MENU BACKGROUND utils/bglug.png +MENU BACKGROUND /utils/bglug.png LABEL edu64 MENU LABEL Installa Edubuntu a ^64 bit - KERNEL ubuntu/14.04/amd64/linux - APPEND vga=normal initrd=ubuntu/14.04/amd64/initrd.gz ks=http://{{ serverfqdn }}/ks/ubuntu-trusty.cfg -- quiet + KERNEL /ubuntu/14.04/amd64/linux + APPEND vga=normal initrd=/ubuntu/14.04/amd64/initrd.gz ks=http://{{ serverfqdn }}/ks/eduubuntu-trusty.cfg -- quiet LABEL edu32 MENU LABEL Installa Edubuntu a ^32 bit - KERNEL ubuntu/14.04/amd64/linux - APPEND vga=normal initrd=ubuntu/14.04/amd64/initrd.gz ks=http://{{ serverfqdn }}/ks/ubuntu-trusty.cfg -- quiet + KERNEL /ubuntu/14.04/amd64/linux + APPEND vga=normal initrd=/ubuntu/14.04/amd64/initrd.gz ks=http://{{ serverfqdn }}/ks/edubuntu-trusty.cfg -- quiet MENU SEPARATOR @@ -28,24 +28,25 @@ MENU TITLE Utilities LABEL aida MENU LABEL ^AIDA - Old Hardware Diagnostic Tool - KERNEL utils/memdisk - INITRD utils/aida.img + KERNEL /utils/memdisk + INITRD /utils/aida.img APPEND floppy LABEL hdt MENU LABEL ^HDT - Hardware Diagnostic Tool - KERNEL utils/memdisk - INITRD utils/hdt.img + KERNEL /utils/memdisk + INITRD /utils/hdt.img APPEND floppy LABEL memtest MENU LABEL ^memtest86 - Test della RAM - KERNEL utils/memtest86/vmlinuz + KERNEL /utils/memtest86/vmlinuz LABEL ranish MENU LABEL ^Ranish - Partition Management Tool - KERNEL utils/memdisk - APPEND initrd=/utils/ranish.img floppy + KERNEL /utils/memdisk + INITRD /utils/ranish.img + APPEND floppy MENU SEPARATOR diff --git a/vagrant/roles/vagrant/tasks/main.yml b/vagrant/roles/vagrant/tasks/main.yml index 6b3a925..cdcbcc6 100644 --- a/vagrant/roles/vagrant/tasks/main.yml +++ b/vagrant/roles/vagrant/tasks/main.yml @@ -7,7 +7,7 @@ sudo: yes - name: Configuro la scheda secondaria - shell: /sbin/e-smith/db networks setprop eth1 bootproto none device eth1 ipaddr 10.0.0.1 netmask 255.255.255.0 onboot yes role green + shell: /sbin/e-smith/db networks setprop eth1 bootproto none device eth1 ipaddr 192.168.0.1 netmask 255.255.255.0 onboot yes role green when: "'NethServer' in chk_nethserver.stdout" sudo: yes notify: