fix ssh config after merging gnocci/setup

[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..9389b94 100644 (file)
--- a/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
+++ b/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
@@ -2,20 +2,19 @@
 # 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 %}
 {% if 'localconfig_ssh_config_user' in hostvars[host] %}
     User {{ hostvars[host].localconfig_ssh_config_user }}
 {% endif %}
-{% if 'localconfig_ssh_config_port' in hostvars[host] %}
-    Port {{ hostvars[host].localconfig_ssh_config_port }}
+{% if hostvars[host].ansible_port != 22000 %}
+    Port {{ hostvars[host].ansible_port }}
 {% endif %}
 
 {% endfor %}
@@ -25,16 +24,6 @@ Host {{ host }}.realraum.at r3-{{ shortname }} r3g-{{ shortname }} r3e-{{ shortn
 Host gw.realraum.at r3-gw
     Hostname gw.realraum.at
 
-Host gnocchi1.realraum.at r3-gnocchi1
-    Hostname gnocchi1.realraum.at
-
-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
@@ -43,6 +32,10 @@ Host ap1.mgmt.realraum.at r3g-ap1
     Hostname ap1.mgmt.realraum.at
     User root
 
+Host ap2.mgmt.realraum.at r3g-ap2
+    Hostname ap2.mgmt.realraum.at
+    User root
+
 Host licht.realraum.at r3-licht r3g-licht r3e-licht
     Hostname licht.realraum.at
     User realraum