make openwrt images for accesspoints (WIP)

[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 dd33944..73ed53c 100644 (file)
--- 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,24 +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
-
-Host ap1.mgmt.realraum.at r3g-ap1
-    Hostname ap1.mgmt.realraum.at
-    User root
-
 Host licht.realraum.at r3-licht r3g-licht r3e-licht
     Hostname licht.realraum.at
     User realraum