it-team/lmn-client
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Move variables only relevant for the installation before '---', playbook variable.

Browse source
This commit is contained in:
Andreas B. Mundt 2019-06-12 22:24:16 +02:00
parent f0004b6fe9
commit 4fdd640d6e
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
installbox.yml
View file

@ -33,7 +33,7 @@
- transparent-squid - transparent-squid
- tftp-netboot-installer - tftp-netboot-installer
- preseed-installer - preseed-installer
# - installbox2kiosk # enable this to install kiosk automatically - installbox2kiosk
post_tasks: post_tasks:
- name: make sure hostname is set correctly in /etc/hosts - name: make sure hostname is set correctly in /etc/hosts

2
roles/installbox2kiosk/tasks/main.yml
View file

@ -61,7 +61,7 @@
in-target chown -R ansible:ansible /home/ansible/.ssh/ ; \ in-target chown -R ansible:ansible /home/ansible/.ssh/ ; \
in-target chmod -R og= /home/ansible/.ssh/ ; \ in-target chmod -R og= /home/ansible/.ssh/ ; \
in-target ansible-pull --verbose --purge --extra-vars="run_in_installer=true" \ in-target ansible-pull --verbose --purge --extra-vars="run_in_installer=true" \
-i localhost, --url=git://{{ hostname }}/.git -i localhost, --url=git://{{ hostname }}/.git $playbook
marker: "# {mark} ANSIBLE MANAGED BLOCK preseed/late_command" marker: "# {mark} ANSIBLE MANAGED BLOCK preseed/late_command"
- name: provide git repo if not available already - name: provide git repo if not available already

8
roles/preseed-installer/tasks/main.yml
View file

@ -24,12 +24,12 @@
LABEL autoinstall LABEL autoinstall
MENU LABEL Debian {{ di_version }} (amd64) + preseed MENU LABEL Debian {{ di_version }} (amd64) + preseed
kernel ::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux kernel ::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux
append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz --- auto=true priority=critical url=tftp://{{ hostname }} append initrd=::/d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml ---
#LABEL daily #LABEL daily
#MENU LABEL Debian daily (amd64) + preseed #MENU LABEL Debian daily (amd64) + preseed
#kernel ::/d-i/n-a/daily/amd64/linux #kernel ::/d-i/n-a/daily/amd64/linux
#append initrd=::/d-i/n-a/daily/amd64/initrd.gz --- auto=true priority=critical url=tftp://{{ hostname }} #append initrd=::/d-i/n-a/daily/amd64/initrd.gz auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml ---
notify: "rebuild di-netboot-assistant menu" notify: "rebuild di-netboot-assistant menu"
- name: add auto efi boot entry to di-netboot-assistant - name: add auto efi boot entry to di-netboot-assistant
@ -38,12 +38,12 @@
insertbefore: EOF insertbefore: EOF
block: | block: |
menuentry 'Debian {{ di_version }} (amd64) + preseed' { menuentry 'Debian {{ di_version }} (amd64) + preseed' {
linux /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux --- auto=true priority=critical url=tftp://{{ hostname }} linux /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/linux auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml ---
initrd /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz initrd /d-i/n-pkg/images/{{ di_version }}/amd64/text/debian-installer/amd64/initrd.gz
} }
#menuentry 'Debian daily (amd64) + preseed' { #menuentry 'Debian daily (amd64) + preseed' {
# linux /d-i/n-a/daily/amd64/linux --- auto=true priority=critical url=tftp://{{ hostname }} # linux /d-i/n-a/daily/amd64/linux auto=true priority=critical url=tftp://{{ hostname }} playbook=kiosk.yml ---
# initrd /d-i/n-a/daily/amd64/initrd.gz # initrd /d-i/n-a/daily/amd64/initrd.gz
#} #}
notify: "rebuild di-netboot-assistant menu" notify: "rebuild di-netboot-assistant menu"