summaryrefslogtreecommitdiff
path: root/services/ubuntu.cf
diff options
context:
space:
mode:
Diffstat (limited to 'services/ubuntu.cf')
-rw-r--r--services/ubuntu.cf21
1 files changed, 6 insertions, 15 deletions
diff --git a/services/ubuntu.cf b/services/ubuntu.cf
index 4988e85..1f69f82 100644
--- a/services/ubuntu.cf
+++ b/services/ubuntu.cf
@@ -1,8 +1,8 @@
-bundle agent ubuntu
+bundle common distrib
{
vars:
ubuntu::
- "wanted" slist => {
+ "packages" slist => {
"at",
"bridge-utils",
"curl",
@@ -19,8 +19,8 @@ bundle agent ubuntu
"vim",
};
ubuntu&!containers::
- "wanted" slist => {
- @(wanted),
+ "packages" slist => {
+ @(packages),
"ethtool",
"iptstate",
"ipvsadm",
@@ -33,8 +33,8 @@ bundle agent ubuntu
"needrestart",
};
ubuntu&console_julien::
- "wanted" slist => {
- @(wanted),
+ "packages" slist => {
+ @(packages),
"apt-file",
"asciidoc",
"build-essential",
@@ -48,13 +48,4 @@ bundle agent ubuntu
"weechat",
"whois",
};
- packages:
- ubuntu::
- "$(wanted)"
- policy => "present",
- package_module => apt_get,
- classes => if_repaired("ubuntu_$(wanted)_add_repaired");
- reports:
- any::
- "$(this.bundle): $(wanted) installed" ifvarclass => "ubuntu_$(wanted)_add_repaired";
}