inventory_hostname vs. host_name

6 files changed, 12 insertions, 12 deletions

diff --git a/inventory/host_vars/dione.yml b/inventory/host_vars/dione.yml
index 0470b8b7..431e0042 100644
--- a/inventory/host_vars/dione.yml
+++ b/inventory/host_vars/dione.yml
@@ -10,13 +10,13 @@ admin_user_host:
 ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
 
 docker_lvm:
-  vg: dione
+  vg: "{{ host_name }}"
   lv: docker
   size: 15G
   fs: ext4
 
 kubelet_lvm:
-  vg: dione
+  vg: "{{ host_name }}"
   lv: kubelet
   size: 10G
   fs: ext4
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index db387d12..2e226ed9 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -215,7 +215,7 @@ openwrt_uci:
   system:
     - name: system
       options:
-        hostname: '{{ inventory_hostname }}'
+        hostname: '{{ host_name }}'
         timezone: 'CET-1CEST,M3.5.0,M10.5.0/3'
         ttylogin: '0'
         log_size: '64'
diff --git a/inventory/host_vars/emc-master.yml b/inventory/host_vars/emc-master.yml
index 2a2de27f..83fc7d29 100644
--- a/inventory/host_vars/emc-master.yml
+++ b/inventory/host_vars/emc-master.yml
@@ -29,13 +29,13 @@ network:
     gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
 
 docker_lvm:
-  vg: "{{ inventory_hostname }}"
+  vg: "{{ host_name }}"
   lv: docker
   size: 10G
   fs: ext4
 
 kubelet_lvm:
-  vg: "{{ inventory_hostname }}"
+  vg: "{{ host_name }}"
   lv: kubelet
   size: 10G
   fs: ext4
diff --git a/inventory/host_vars/emc-stats.yml b/inventory/host_vars/emc-stats.yml
index 0bd53559..41f30645 100644
--- a/inventory/host_vars/emc-stats.yml
+++ b/inventory/host_vars/emc-stats.yml
@@ -33,20 +33,20 @@ network:
     gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
 
 docker_lvm:
-  vg: "{{ inventory_hostname }}"
+  vg: "{{ host_name }}"
   lv: docker
   size: 15G
   fs: ext4
 
 kubelet_lvm:
-  vg: "{{ inventory_hostname }}"
+  vg: "{{ host_name }}"
   lv: kubelet
   size: 10G
   fs: ext4
 
 emc_stats_lvm:
   pvs: /dev/vdb
-  vg: "{{ inventory_hostname }}-data"
+  vg: "{{ host_name }}-data"
   lv: stats
   size: 50G
   fs: ext4
diff --git a/inventory/host_vars/helene.yml b/inventory/host_vars/helene.yml
index 3b01b589..431e0042 100644
--- a/inventory/host_vars/helene.yml
+++ b/inventory/host_vars/helene.yml
@@ -10,13 +10,13 @@ admin_user_host:
 ssh_allowusers_host: "{{ admin_user_host | map(attribute='name') | list }}"
 
 docker_lvm:
-  vg: helene
+  vg: "{{ host_name }}"
   lv: docker
   size: 15G
   fs: ext4
 
 kubelet_lvm:
-  vg: helene
+  vg: "{{ host_name }}"
   lv: kubelet
   size: 10G
   fs: ext4
diff --git a/inventory/host_vars/k8s-test2.yml b/inventory/host_vars/k8s-test2.yml
index 255e5596..13b346c5 100644
--- a/inventory/host_vars/k8s-test2.yml
+++ b/inventory/host_vars/k8s-test2.yml
@@ -29,13 +29,13 @@ network:
     gateway: "{{ hostvars[vm_host].vm_host.network.gateway | default(hostvars[vm_host].vm_host.network.ip) }}"
 
 docker_lvm:
-  vg: "{{ inventory_hostname }}"
+  vg: "{{ host_name }}"
   lv: docker
   size: 3G
   fs: ext4
 
 kubelet_lvm:
-  vg: "{{ inventory_hostname }}"
+  vg: "{{ host_name }}"
   lv: kubelet
   size: 1G
   fs: ext4