diff options
| -rw-r--r-- | inventory/hosts.ini | 21 | ||||
| -rw-r--r-- | roles/preseed/templates/preseed_debian-stretch.cfg.j2 | 4 |
2 files changed, 11 insertions, 14 deletions
diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 34e12592..9544202a 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -1,5 +1,6 @@ [all:vars] -#ansible_host={{ inventory_hostname }}.{{ host_domain }} +host_name={{ inventory_hostname }} +ansible_host={{ host_name }}.{{ host_domain }} ansible_user=root ansible_port=22000 @@ -18,7 +19,7 @@ mail stats auth atlas -pan +pan ansible_port=222 keyserver mimas @@ -31,7 +32,7 @@ host_domain=spreadspace.org environment_group=spreadspace [spreadspace] -build ansible_port=222 +build calypso telesto thetys @@ -63,9 +64,8 @@ host_domain=skillz.biz environment_group=elevate [skillz] -sk2013 -sk2016 -sktorrent +sk2013 host_name=2013 +sk2016 host_name=2016 [elevate:vars] @@ -73,10 +73,9 @@ host_domain=elevate.at environment_group=elevate [elevate] -elewolke -elestream -elemedia -elesearch +elewolke host_name=wolke +elemedia host_name=media +elesearch host_name=search ############################### @@ -94,9 +93,7 @@ sk2016 emc-stats emc-master mimas -sktorrent elewolke -elestream elesearch [hetzner:children] diff --git a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 index 7a3511a5..74ab18e8 100644 --- a/roles/preseed/templates/preseed_debian-stretch.cfg.j2 +++ b/roles/preseed/templates/preseed_debian-stretch.cfg.j2 @@ -4,8 +4,8 @@ d-i debian-installer/language string en d-i debian-installer/country string AT -d-i debian-installer/locale string de_AT.UTF-8 -d-i keyboard-configuration/xkb-keymap select de +d-i debian-installer/locale string en_US.UTF-8 +d-i keyboard-configuration/xkb-keymap select us d-i netcfg/disable_dhcp boolean true d-i netcfg/choose_interface select {{ install_interface | default(hostvars[hostname].network_cooked.primary.interface) }} |