From: Christian Pointner <equinox@realraum.at>
Date: Sun, 22 Apr 2018 18:00:01 +0000 (+0200)
Subject: ansible: merge master to vm-install branch
X-Git-Url: https://git.realraum.at/?a=commitdiff_plain;h=8467e799f80e6de4ab7779d08993a3381c227304;p=noc.git

ansible: merge master to vm-install branch
---

8467e799f80e6de4ab7779d08993a3381c227304
diff --cc ansible/hosts.ini
index 9edea82,a741934..519fe6a
--- a/ansible/hosts.ini
+++ b/ansible/hosts.ini
@@@ -3,25 -3,39 +3,41 @@@ host_domain=realraum.a
  ansible_host={{ inventory_hostname }}.{{ host_domain }}
  ansible_user=root
  
+ [net-zone-mgmt]
+ #torwaechter
+ alfred
+ calendar
+ galley
+ hacksch
 -## TODO: remove the variable once https://github.com/ansible/ansible/issues/39119 is fixed
 -metrics localconfig_ssh_config_user=root
+ r3home
+ tickets
++## TODO: remove the variable once https://github.com/ansible/ansible/issues/39119 is fixed
++metrics localconfig_ssh_config_user=root
++testvm localconfig_ssh_config_user=root
+ 
+ [net-zone-mgmt:vars]
+ host_domain=mgmt.realraum.at
+ 
+ ##########################
+ 
  [baremetalservers]
- alfred.mgmt
+ alfred
  
  [kvmhosts]
- alfred.mgmt
+ alfred
  
  [virtualservers]
  athsdisc
- calendar.mgmt
+ calendar
  ctf
  entrance
- galley.mgmt
- hacksch.mgmt
- r3home.mgmt
- tickets.mgmt
+ galley
+ hacksch
+ metrics
+ r3home
+ tickets
  vex
- ## TODO: remove the variable once https://github.com/ansible/ansible/issues/39119 is fixed
- metrics.mgmt localconfig_ssh_config_user=root
- testvm.mgmt localconfig_ssh_config_user=root
++testvm
  
  [servers:children]
  baremetalservers