diff options
| author | Romain Gonçalves <me@rgoncalves.se> | 2021-12-09 16:35:17 +0000 |
|---|---|---|
| committer | Romain Gonçalves <me@rgoncalves.se> | 2021-12-09 16:43:04 +0000 |
| commit | e27316ae6e6b53e5385feb85c1f7b8d41324e766 (patch) | |
| tree | 75c9929fe5185d0b4bfdafe2e5d0ffc1fdfccc1a | |
| parent | 01c8bdc81c1cefa951fd0610d4713c308edd86b9 (diff) | |
| download | infrastructure-e27316ae6e6b53e5385feb85c1f7b8d41324e766.tar.gz | |
roles/vmm: Fix disk space and hostname for test install
| -rw-r--r-- | roles/vmm/templates/autoinstall.conf.j2 | 8 | ||||
| -rw-r--r-- | roles/vmm/templates/disklabel.j2 | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/roles/vmm/templates/autoinstall.conf.j2 b/roles/vmm/templates/autoinstall.conf.j2 index 093b823..af6506e 100644 --- a/roles/vmm/templates/autoinstall.conf.j2 +++ b/roles/vmm/templates/autoinstall.conf.j2 @@ -3,8 +3,9 @@ System hostname = {{ item.name }} Which network interface do you wish to configure = vio0 IPv4 address for vio0 = {{ host.__ip.external }} Default IPv4 route = {{ ansible_default_ipv4.gateway }} -Using DNS domainname = {{ host.inventory_hostname }}.{{ __global_domain_name_hosts }}.{{ __global_domain_name }} -Using DNS nameservers = {{ __global_domain_name_servers | join (" ") }} +DNS domain name = {{ __global_domain_name_hosts }}.{{ __global_domain_name }} +DNS nameservers = {{ __global_domain_name_servers | join (" ") }} +Do you expect to run the X Window System = no Password for root = {{ lookup('password', lookup('env', 'PWD') ~ '/files/secrets/hosts/' ~ host.inventory_hostname ~ '/root-password') }}" Public ssh key for root account = {{ vmm_default_ssh_key }} Which disk is the root disk = sd0 @@ -13,4 +14,5 @@ Allow root ssh login = yes What timezone are you in = {{ vmm_default_timezone }} Unable to connect using https. Use http instead = {{ "yes" if vmm_default_fallback_http else "no" }} Location of sets = http -Set name(s) = -all bsd* base* comp* man* +Set name(s) = -x* +Set name(s) = -g* diff --git a/roles/vmm/templates/disklabel.j2 b/roles/vmm/templates/disklabel.j2 index f0c3443..c144ed5 100644 --- a/roles/vmm/templates/disklabel.j2 +++ b/roles/vmm/templates/disklabel.j2 @@ -1,2 +1,2 @@ +/ 2G-* 100% swap 2G -/ 2G-* |