From 3a2533a94890d084f9d39b8eec46f00dd50068ea Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 7 Jul 2015 01:37:47 +0200 Subject: [PATCH] Gestita configurazione client con script post-ks.sh. Aggiustato il tiro per installare il minimo indispensabile e una versione di ansible sufficientemente aggiornata. --- roles/pxe/tasks/main.yml | 1 + roles/pxe/templates/ks/client-trusty.cfg | 19 ++++++++++++------- roles/pxe/templates/ks/post-ks.sh | 12 ++++++++++++ 3 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 roles/pxe/templates/ks/post-ks.sh diff --git a/roles/pxe/tasks/main.yml b/roles/pxe/tasks/main.yml index 6c6f1e1..1afb005 100644 --- a/roles/pxe/tasks/main.yml +++ b/roles/pxe/tasks/main.yml @@ -128,6 +128,7 @@ - client-trusty.cfg - docenti-trusty.cfg - ubuntu-trusty.cfg + - post-ks.sh - name: Ripristino impostazioni mirrorpath set_fact: mirrorpath="{{ oldmirrorpath }}" diff --git a/roles/pxe/templates/ks/client-trusty.cfg b/roles/pxe/templates/ks/client-trusty.cfg index bd37263..feba09a 100644 --- a/roles/pxe/templates/ks/client-trusty.cfg +++ b/roles/pxe/templates/ks/client-trusty.cfg @@ -42,16 +42,21 @@ skipx services --enabled=openssh #Install packages %packages -@ ubuntu-desktop -@ edubuntu-desktop -@ ubuntu-edu-secondary vim screen cifs-utils +curl openssh-server +software-properties-common +libyaml-0-2 +python-jinja2 +python-markupsafe +python-paramiko +python-support +python-yaml +python-crypto +sshpass #Post installation commands -%post --nochroot +%post #the target filesystem in nochroot environment is in /target -TARGETHOSTNAME=$(wget -qO- http://{{ serverfqdn }}:3000/whatsmyhostname) -echo $TARGETHOSTNAME > /target/etc/hostname -sed -i "s/kickseed/$TARGETHOSTNAME/g" /target/etc/hosts +\curl -sSL http://{{ serverfqdn }}/ks/post-ks.sh | bash diff --git a/roles/pxe/templates/ks/post-ks.sh b/roles/pxe/templates/ks/post-ks.sh new file mode 100644 index 0000000..e323456 --- /dev/null +++ b/roles/pxe/templates/ks/post-ks.sh @@ -0,0 +1,12 @@ +#!/bin/bash + +# Cambio username con quello fornito da servizio +TARGETHOSTNAME=$(wget -qO- http://{{ serverfqdn }}:3000/whatsmyhostname) +echo $TARGETHOSTNAME > /etc/hostname +sed -i "s/kickseed/$TARGETHOSTNAME/g" /etc/hosts + +# Installo l'ultimo ansible per ansible-pull +export https_proxy=https://{{ serverip }}:3128 +add-apt-repository -y ppa:ansible/ansible +apt-get update && apt-get install -y ansible +unset https_proxy