swedenconnect/eid-ops
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

clean up kvm vms

Browse source
This commit is contained in:
Fredrik Thulin 2018-05-04 14:39:11 +02:00
parent d9393a8ca0
commit 81292466c2
No known key found for this signature in database
GPG key ID: 2707330D4030CCAD
3 changed files with 6 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
global/overlay/etc/puppet/cosmos-rules.yaml
View file

@ -8,9 +8,6 @@
domain: sunet.se domain: sunet.se
sunet::rsyslog: sunet::rsyslog:
'^kvm.+-.+-\d+\.komreg\.net$':
eid::kvmhost:
jmp.komreg.net: jmp.komreg.net:
konsulter: konsulter:
sunet_iaas_cloud: sunet_iaas_cloud:
@ -21,7 +18,7 @@ jmp.komreg.net:
autoupdate: autoupdate:
kvmfe-fre-3.komreg.net: kvmfe-fre-3.komreg.net:
eid::kvm_vms: eid::kvmhost:
vms: vms:
fe-fre-3.komreg.net: fe-fre-3.komreg.net:
mac: '52:54:20:01:00:01' mac: '52:54:20:01:00:01'

5
global/overlay/etc/puppet/modules/eid/manifests/kvm_vms.pp
View file

@ -1,5 +0,0 @@
class eid::kvm_vms(
Hash $vms
) {
create_resources('eid::cloudimage', $vms)
}

7
global/overlay/etc/puppet/modules/eid/manifests/kvmhost.pp
View file

@ -1,6 +1,7 @@
class eid::kvmhost( class eid::kvmhost(
$proxy_server = hiera('eid_proxy_server'), String $proxy_server = hiera('eid_proxy_server'),
$no_proxy = hiera('eid_no_proxy'), String $no_proxy = hiera('eid_no_proxy'),
Hash $vms = [],
) { ) {
file { file {
'/etc/cosmos-manual-reboot': '/etc/cosmos-manual-reboot':
@ -37,4 +38,6 @@ class eid::kvmhost(
line => '8021q', line => '8021q',
; ;
} }
create_resources('eduid::cloudimage', $vms)
} }