various bundles: fix dependencies
Some checks failed
kunsi/bundlewrap/pipeline/head There was a failure building this commit
Some checks failed
kunsi/bundlewrap/pipeline/head There was a failure building this commit
This commit is contained in:
parent
3455e6daa2
commit
a01c28da21
4 changed files with 20 additions and 18 deletions
|
@ -1,14 +1,6 @@
|
|||
if node.has_bundle('pacman'):
|
||||
package = 'pkg_pacman:lldpd'
|
||||
else:
|
||||
package = 'pkg_apt:lldpd'
|
||||
|
||||
directories = {
|
||||
'/etc/lldpd.d': {
|
||||
'purge': True,
|
||||
'needs': {
|
||||
package,
|
||||
},
|
||||
'triggers': {
|
||||
'svc_systemd:lldpd:restart',
|
||||
},
|
||||
|
@ -18,9 +10,6 @@ directories = {
|
|||
files = {
|
||||
'/etc/lldpd.conf': {
|
||||
'delete': True,
|
||||
'needs': {
|
||||
package,
|
||||
},
|
||||
},
|
||||
'/etc/lldpd.d/bundlewrap.conf': {
|
||||
'content_type': 'mako',
|
||||
|
@ -34,7 +23,6 @@ svc_systemd = {
|
|||
'lldpd': {
|
||||
'needs': {
|
||||
'file:/etc/lldpd.d/bundlewrap.conf',
|
||||
package,
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -1,12 +1,24 @@
|
|||
defaults = {
|
||||
'apt': {
|
||||
'packages': {
|
||||
'lldpd': {},
|
||||
'lldpd': {
|
||||
'needed_by': [
|
||||
'directory:/etc/lldpd.d',
|
||||
'file:/etc/lldp.conf',
|
||||
'svc_systemd:lldpd',
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
'pacman': {
|
||||
'packages': {
|
||||
'lldpd': {},
|
||||
'lldpd': {
|
||||
'needed_by': [
|
||||
'directory:/etc/lldpd.d',
|
||||
'file:/etc/lldp.conf',
|
||||
'svc_systemd:lldpd',
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -16,8 +16,5 @@ actions = {
|
|||
|
||||
svc_systemd = {
|
||||
'nfs-server': {
|
||||
'needs': {
|
||||
'pkg_apt:nfs-kernel-server',
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -3,7 +3,12 @@ from bundlewrap.metadata import atomic
|
|||
defaults = {
|
||||
'apt': {
|
||||
'packages': {
|
||||
'nfs-kernel-server': {}
|
||||
'nfs-server': {
|
||||
'needed_by': [
|
||||
'svc_systemd:nfs-kernel-server',
|
||||
'action:nfs_reload_shares',
|
||||
],
|
||||
},
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue