From 0622a2a965ff5cd11666b3e1659e94cefe3a0ea1 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@spreadspace.org>
Date: Thu, 29 Jul 2021 00:08:36 +0200
Subject: install ele-dione and ele-helene

---
 dan/ele-dione.yml                   |  2 +-
 dan/ele-helene.yml                  |  2 +-
 inventory/host_vars/ele-dione.yml   | 12 +++++++++---
 inventory/host_vars/ele-helene.yml  | 12 +++++++++---
 inventory/host_vars/ele-telesto.yml |  1 +
 5 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/dan/ele-dione.yml b/dan/ele-dione.yml
index ca04c441..0acdeb7f 100644
--- a/dan/ele-dione.yml
+++ b/dan/ele-dione.yml
@@ -7,6 +7,6 @@
   - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
-  - role: core/ntp
+#  - role: core/ntp
   - role: core/admin-users
   - role: streaming/blackmagic/desktopvideo
diff --git a/dan/ele-helene.yml b/dan/ele-helene.yml
index 172946f1..b07ba524 100644
--- a/dan/ele-helene.yml
+++ b/dan/ele-helene.yml
@@ -7,7 +7,7 @@
   - role: core/sshd/base
   - role: core/zsh
   - role: core/cpu-microcode
-  - role: core/ntp
+#  - role: core/ntp
   - role: core/admin-users
   - role: streaming/blackmagic/desktopvideo
   post_tasks:
diff --git a/inventory/host_vars/ele-dione.yml b/inventory/host_vars/ele-dione.yml
index 16bfd158..22319a9f 100644
--- a/inventory/host_vars/ele-dione.yml
+++ b/inventory/host_vars/ele-dione.yml
@@ -8,16 +8,22 @@ install:
     - "nomodeset"
 
 network:
-  nameservers: "{{ network_zones.lan.dns }}"
+  nameservers:
+  - 1.1.1.1
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
-    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
+    address: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets['ele-mur']) | ipaddr('address') }}"
   interfaces:
   - *_network_primary_
 
 
+apt_repo_components:
+  - main
+  - contrib
+  - non-free ## for microcode updates
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/ele-helene.yml b/inventory/host_vars/ele-helene.yml
index 5d15ef85..d2b49178 100644
--- a/inventory/host_vars/ele-helene.yml
+++ b/inventory/host_vars/ele-helene.yml
@@ -8,16 +8,22 @@ install:
     - "nomodeset"
 
 network:
-  nameservers: "{{ network_zones.lan.dns }}"
+  nameservers:
+  - 1.1.1.1
   domain: "{{ host_domain }}"
   primary: &_network_primary_
     name: eno1
-    address: "{{ network_zones.lan.prefix | ipaddr(network_zones.lan.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
-    gateway: "{{ network_zones.lan.gateway }}"
+    address: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets[inventory_hostname]) | ipaddr('address/prefix') }}"
+    gateway: "{{ network_zones.murat_transfer.prefix | ipaddr(network_zones.murat_transfer.offsets['ele-mur']) | ipaddr('address') }}"
   interfaces:
   - *_network_primary_
 
 
+apt_repo_components:
+  - main
+  - contrib
+  - non-free ## for microcode updates
+
 base_packages_extra_host:
   - exfat-fuse
   - exfat-utils
diff --git a/inventory/host_vars/ele-telesto.yml b/inventory/host_vars/ele-telesto.yml
index cbeddd2d..c02868b5 100644
--- a/inventory/host_vars/ele-telesto.yml
+++ b/inventory/host_vars/ele-telesto.yml
@@ -20,6 +20,7 @@ network:
   vlans:
     eno1: "{{ __vmhost_bridge_interface_zones__['eno1'] | map('extract', network_zones) | map(attribute='vlan') | list }}"
 
+
 apt_repo_components:
   - main
   - contrib  ## for zfs
-- 
cgit v1.2.3