ansible: torwaechter is already part of the dynamically generated ssh config

[noc.git] / ansible / roles / localconfig / templates / ssh / 10r3.conf.j2

diff --git a/ansible/roles/localconfig/templates/ssh/10r3.conf.j2 b/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
index ba11160..e133de8 100644 (file)
--- a/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
+++ b/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
@@ -2,12 +2,11 @@
 # realraum ssh-config (generated by ansible NOC repo)
 
 #######################################
-### dynamically generated hosts
+### dynamically generated host configs
 
 {% for host in (groups['all'] | sort) %}
-{% set shortname = (host.split('.') | first) %}
-Host {{ host }}.realraum.at r3-{{ shortname }} r3g-{{ shortname }} r3e-{{ shortname }}
-    Hostname {{ host }}.realraum.at
+Host {{ hostvars[host].ansible_host }} r3-{{ host }} r3g-{{ host }} r3e-{{ host }}
+    Hostname {{ hostvars[host].ansible_host }}
 {% if 'localconfig_ssh_config_proxycommand' in hostvars[host] %}
     ProxyCommand {{ hostvars[host].localconfig_ssh_config_proxycommand }}
 {% endif %}
@@ -31,10 +30,6 @@ Host gnocchi1.realraum.at r3-gnocchi1
 Host gnocchi2.realraum.at r3-gnocchi2
     Hostname gnocchi2.realraum.at
 
-Host torwaechter.mgmt.realraum.at r3g-torwaechter
-    Hostname torwaechter.mgmt.realraum.at
-    User realraum
-
 Host ap0.mgmt.realraum.at r3g-ap0
     Hostname ap0.mgmt.realraum.at
     User root