get rid of cloud-init
All checks were successful
bundlewrap/pipeline/head This commit looks good

This commit is contained in:
Franzi 2020-08-20 11:07:18 +02:00
parent 303519be1b
commit 21343f6213
Signed by: kunsi
GPG key ID: 12E3D2136B818350
3 changed files with 17 additions and 26 deletions

View file

@ -18,6 +18,15 @@ files = {
'/etc/apt/apt.conf.d/20auto-upgrades': { '/etc/apt/apt.conf.d/20auto-upgrades': {
'source': 'apt.conf-auto-upgrades', 'source': 'apt.conf-auto-upgrades',
}, },
'/etc/cloud': {
'delete': True,
},
'/etc/netplan': {
'delete': True,
},
'/var/lib/cloud': {
'delete': True,
},
} }
directories = { directories = {
@ -60,9 +69,16 @@ pkg_apt = {
'wget': {}, 'wget': {},
'whois': {}, 'whois': {},
'zip': {}, 'zip': {},
'cloud-init': {
'installed': False,
},
'netplan.io': {
'installed': False,
},
} }
gpg_keys = set()
for name, data in node.metadata.get('apt', {}).get('repos', {}).items(): for name, data in node.metadata.get('apt', {}).get('repos', {}).items():
files['/etc/apt/sources.list.d/{}.list'.format(name)] = { files['/etc/apt/sources.list.d/{}.list'.format(name)] = {
'content_type': 'mako', 'content_type': 'mako',
@ -87,26 +103,3 @@ for name, data in node.metadata.get('apt', {}).get('repos', {}).items():
if node.metadata.get('apt', {}).get('packages', {}): if node.metadata.get('apt', {}).get('packages', {}):
for package, options in node.metadata['apt']['packages'].items(): for package, options in node.metadata['apt']['packages'].items():
pkg_apt[package] = options pkg_apt[package] = options
if node.metadata.get('keep-cloud-init', False):
pkg_apt['cloud-init'] = {
'installed': True,
}
else:
pkg_apt['cloud-init'] = {
'installed': False,
}
pkg_apt['netplan.io'] = {
'installed': False,
}
files['/etc/cloud'] = {
'delete': True,
}
files['/etc/netplan'] = {
'delete': True,
}
files['/var/lib/cloud'] = {
'delete': True,
}

View file

@ -4,7 +4,6 @@ nodes['htz-cloud.pirmasens'] = {
'webserver', 'webserver',
}, },
'metadata': { 'metadata': {
'keep-cloud-init': True,
'letsencrypt': { 'letsencrypt': {
'domains': { 'domains': {
'mail.kunsmann.info': {}, 'mail.kunsmann.info': {},

View file

@ -9,7 +9,6 @@ nodes['htz-cloud.sewfile'] = {
'webserver', 'webserver',
}, },
'metadata': { 'metadata': {
'keep-cloud-init': True,
'nginx': { 'nginx': {
'vhosts': { 'vhosts': {
'sewfile.franzi.business': { 'sewfile.franzi.business': {