diff options
| -rw-r--r-- | chaos-at-home/ch-auth-legacy.yml | 1 | ||||
| -rw-r--r-- | chaos-at-home/ch-prometheus-legacy.yml | 1 | ||||
| -rw-r--r-- | files/common/keyrings/debian-jessie.gpg | bin | 0 -> 6687 bytes | |||
| -rw-r--r-- | inventory/group_vars/chaos-at-home/network.yml | 3 | ||||
| -rw-r--r-- | inventory/host_vars/ch-prometheus-legacy.yml | 6 | ||||
| -rw-r--r-- | inventory/hosts.ini | 1 | ||||
| -rw-r--r-- | roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 | 4 |
7 files changed, 11 insertions, 5 deletions
diff --git a/chaos-at-home/ch-auth-legacy.yml b/chaos-at-home/ch-auth-legacy.yml index 1e15efa8..34c478fd 100644 --- a/chaos-at-home/ch-auth-legacy.yml +++ b/chaos-at-home/ch-auth-legacy.yml @@ -1,6 +1,7 @@ --- - name: Basic Setup hosts: ch-auth-legacy + gather_facts: no tasks: - debug: msg: legacy host, not maintained by ansible... diff --git a/chaos-at-home/ch-prometheus-legacy.yml b/chaos-at-home/ch-prometheus-legacy.yml index f147090d..a2fc2147 100644 --- a/chaos-at-home/ch-prometheus-legacy.yml +++ b/chaos-at-home/ch-prometheus-legacy.yml @@ -1,6 +1,7 @@ --- - name: Basic Setup hosts: ch-prometheus-legacy + gather_facts: no tasks: - debug: msg: legacy host, not maintained by ansible... diff --git a/files/common/keyrings/debian-jessie.gpg b/files/common/keyrings/debian-jessie.gpg Binary files differnew file mode 100644 index 00000000..acd9f555 --- /dev/null +++ b/files/common/keyrings/debian-jessie.gpg diff --git a/inventory/group_vars/chaos-at-home/network.yml b/inventory/group_vars/chaos-at-home/network.yml index c004feb9..e70cc896 100644 --- a/inventory/group_vars/chaos-at-home/network.yml +++ b/inventory/group_vars/chaos-at-home/network.yml @@ -19,8 +19,7 @@ network_zones: ch-gw-lan: 254 ############# ## legacy stuff - ch-prometheus-old: 250 - ch-prometheus-legacy: 99 ## legacy + ch-prometheus-legacy: 250 wifi: ssid: "chaos at home" encryption: "psk2" diff --git a/inventory/host_vars/ch-prometheus-legacy.yml b/inventory/host_vars/ch-prometheus-legacy.yml index 2bcff013..afab98c0 100644 --- a/inventory/host_vars/ch-prometheus-legacy.yml +++ b/inventory/host_vars/ch-prometheus-legacy.yml @@ -13,12 +13,16 @@ install: size: 20g sdb: type: zfs + name: boot + size: 512M + sdc: + type: zfs backend: storage name: home size: 350g system_lvm: volumes: - - name: root + - name: ruth size: 5G filesystem: ext4 mountpoint: / diff --git a/inventory/hosts.ini b/inventory/hosts.ini index 15764446..38cb9168 100644 --- a/inventory/hosts.ini +++ b/inventory/hosts.ini @@ -227,6 +227,7 @@ ansible_python_interpreter=/usr/bin/python python_basename=python [python2] +ch-prometheus-legacy ch-atlas ch-pan ch-mimas diff --git a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 index cc1f5037..e274c645 100644 --- a/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 +++ b/roles/installer/debian/preseed/templates/preseed_debian-jessie.cfg.j2 @@ -31,8 +31,8 @@ d-i netcfg/wireless_wep string d-i mirror/country string manual -d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_archive.host }} -d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian_archive.path }} +d-i mirror/http/hostname string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian.host }} +d-i mirror/http/directory string {{ apt_repo_providers[hostvars[install_hostname].apt_repo_provider].debian.path }} d-i mirror/http/proxy string |