X-Git-Url: https://git.realraum.at/?a=blobdiff_plain;f=ansible%2Froles%2Flocalconfig%2Ftemplates%2Fssh%2F10r3.conf.j2;h=9389b943fb63fc18afaacdcfd574fcffdd19ebf3;hb=1f43c8db8622ed77aecb7789b0937f40dec17621;hp=dd33944d4d20301c756275e2b6c0420cf4b1ac76;hpb=8b725abbd453499388e1108987d951a023ab29c5;p=noc.git

diff --git a/ansible/roles/localconfig/templates/ssh/10r3.conf.j2 b/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
index dd33944..9389b94 100644
--- a/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
+++ b/ansible/roles/localconfig/templates/ssh/10r3.conf.j2
@@ -13,8 +13,8 @@ Host {{ hostvars[host].ansible_host }} r3-{{ host }} r3g-{{ host }} r3e-{{ host
 {% 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 %}
@@ -24,16 +24,6 @@ Host {{ hostvars[host].ansible_host }} r3-{{ host }} r3g-{{ host }} r3e-{{ host
 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
@@ -42,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