Split off "apt-base" from "debian-base"; introduce "ubuntu-base"

All these roles are dependencies of "os-base", don't reference them
directly from other roles!

diff --git a/roles/apt-base/handlers/main.yml b/roles/apt-base/handlers/main.yml
new file mode 100644 (file)
index 0000000..608e119
--- /dev/null
+++ b/roles/apt-base/handlers/main.yml
@@ -0,0 +1,9 @@
+---
+# handlers file for debian-base
+
+- name: "update APT repositories"
+  tags:
+    - apt
+    - packages
+  apt: >
+    update_cache=yes

diff --git a/roles/apt-base/tasks/main.yml b/roles/apt-base/tasks/main.yml
new file mode 100644 (file)
index 0000000..b09fba5
--- /dev/null
+++ b/roles/apt-base/tasks/main.yml
@@ -0,0 +1,53 @@
+---
+# tasks file for apt
+
+- name: 'apt(8): Disable "package diffs"'
+  tags:
+    - apt
+    - packages
+  lineinfile: >
+    create=yes
+    dest=/etc/apt/apt.conf
+    group=root
+    line='Acquire::PDiffs "false";'
+    mode=644
+    owner=root
+
+- name: "aptitude(8): Don't install recommended packages by default"
+  tags:
+    - apt
+    - packages
+  lineinfile: >
+    create=yes
+    dest=/root/.aptitude/config
+    group=root
+    line='Apt::Install-Recommends "false";'
+    owner=root
+
+- name: update APT repositories (when outdated)
+  tags:
+    - apt
+    - packages
+  apt: >
+    update_cache=yes
+    cache_valid_time=3600
+
+- name: configure debconf(1) frontend
+  tags:
+    - debconf
+    - packages
+  debconf: >
+    name=debconf
+    question=debconf/frontend
+    value=Dialog
+    vtype=select
+
+- name: configure debconf(1) priority
+  tags:
+    - debconf
+    - packages
+  debconf: >
+    name=debconf
+    question=debconf/priority
+    value=low
+    vtype=select

diff --git a/roles/debian-base/handlers/main.yml b/roles/debian-base/handlers/main.yml
deleted file mode 100644 (file)
index 608e119..0000000
--- a/roles/debian-base/handlers/main.yml
+++ /dev/null
@@ -1,9 +0,0 @@
----
-# handlers file for debian-base
-
-- name: "update APT repositories"
-  tags:
-    - apt
-    - packages
-  apt: >
-    update_cache=yes

diff --git a/roles/debian-base/tasks/main.yml b/roles/debian-base/tasks/main.yml
index 326bb6c5fab1dd6a7907e7adbe17a337d9d06166..91fbd1f344ee71103e340af2cd34c81446048f60 100644 (file)
--- a/roles/debian-base/tasks/main.yml
+++ b/roles/debian-base/tasks/main.yml
@@ -1,56 +1,5 @@
 ---
-# debian-base tasks
-
-- name: 'apt(8): Disable "package diffs"'
-  tags:
-    - apt
-    - packages
-  lineinfile: >
-    create=yes
-    dest=/etc/apt/apt.conf
-    group=root
-    line='Acquire::PDiffs "false";'
-    mode=644
-    owner=root
-
-- name: "aptitude(8): Don't install recommended packages by default"
-  tags:
-    - apt
-    - packages
-  lineinfile: >
-    create=yes
-    dest=/root/.aptitude/config
-    group=root
-    line='Apt::Install-Recommends "false";'
-    owner=root
-
-- name: update APT repositories (when outdated)
-  tags:
-    - apt
-    - packages
-  apt: >
-    update_cache=yes
-    cache_valid_time=3600
-
-- name: configure debconf(1) frontend
-  tags:
-    - debconf
-    - packages
-  debconf: >
-    name=debconf
-    question=debconf/frontend
-    value=Dialog
-    vtype=select
-
-- name: configure debconf(1) priority
-  tags:
-    - debconf
-    - packages
-  debconf: >
-    name=debconf
-    question=debconf/priority
-    value=low
-    vtype=select
+# tasks file for debian-base
 
 - name: install common packages
   tags:

diff --git a/roles/os-base/meta/main.yml b/roles/os-base/meta/main.yml
index 41b1ea355fd8f1780eb0894f3c5fa9800df48a10..1a24bfc29e20e81fb83d6d07364eb60c147dedee 100644 (file)
--- a/roles/os-base/meta/main.yml
+++ b/roles/os-base/meta/main.yml
@@ -2,4 +2,6 @@
 # meta file for os-base
 
 dependencies:
+  - { role: apt-base, when: "ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu'"}
   - { role: debian-base, when: "ansible_distribution == 'Debian'" }
+  - { role: ubuntu-base, when: "ansible_distribution == 'Ubuntu'" }

diff --git a/roles/ubuntu-base/tasks/main.yml b/roles/ubuntu-base/tasks/main.yml
new file mode 100644 (file)
index 0000000..50a8ac7
--- /dev/null
+++ b/roles/ubuntu-base/tasks/main.yml
@@ -0,0 +1,28 @@
+---
+# tasks file for ubuntu-base
+
+- name: install common packages
+  tags:
+    - packages
+  apt: >
+    state=installed
+    name={{ item }}
+  with_items:
+    - bash-completion
+    - busybox-static
+    - ca-certificates
+    - curl
+    - debconf-utils
+    - etckeeper
+    - git
+    - htop
+    - less
+    - linux-image-generic
+    - lsb-base
+    - lsb-release
+    - psmisc
+    - net-tools
+    - screen
+    - sudo
+    - telnet-ssl
+    - vim