summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2016-06-19 12:04:54 +0300
committerLars Wirzenius <liw@liw.fi>2016-06-19 12:04:54 +0300
commit62e1e017452760de937bf7a3cadb5f54d8b12bfe (patch)
treee1d6865702dc2ef742e11f3d81fd6a507417577c
parent0d774955d076c668b89d8ba8c194e9b889772f4a (diff)
downloadansibleness-62e1e017452760de937bf7a3cadb5f54d8b12bfe.tar.gz
Move stuff out of iiw-devel-system
-rw-r--r--ansible/exolobe3.yml3
-rw-r--r--ansible/leonard.yml4
-rw-r--r--ansible/qvarntest.yml4
-rw-r--r--ansible/roles/emacs/tasks/main.yml8
-rw-r--r--ansible/roles/liw-devel-system/tasks/main.yml57
-rw-r--r--ansible/roles/obnam-dev-env/tasks/main.yml3
-rw-r--r--ansible/roles/python-dev-env/tasks/main.yml15
-rw-r--r--ansible/roles/qvarnlabs-devel-system/tasks/main.yml12
8 files changed, 49 insertions, 57 deletions
diff --git a/ansible/exolobe3.yml b/ansible/exolobe3.yml
index c2e8d21..bd798a1 100644
--- a/ansible/exolobe3.yml
+++ b/ansible/exolobe3.yml
@@ -24,6 +24,9 @@
- intel-wifi
- vmhost
- liw-devel-system
+ - obnam-dev-env
+ - python-dev-env
+ - emacs
- gnome-system
- mail-client
- liw-laptop-http
diff --git a/ansible/leonard.yml b/ansible/leonard.yml
index 92ebce8..ea3d3ed 100644
--- a/ansible/leonard.yml
+++ b/ansible/leonard.yml
@@ -22,6 +22,10 @@
- code.liw.fi-using-apt
- liw-usual
- liw-devel-system
+ - obnam-dev-env
+ - python-dev-env
+ - debian-dev-env
+ - qvarnlabs-devel-system
- mail-client
- documentation-prep-system
- audio-handler
diff --git a/ansible/qvarntest.yml b/ansible/qvarntest.yml
index cccf8f1..84f9a13 100644
--- a/ansible/qvarntest.yml
+++ b/ansible/qvarntest.yml
@@ -13,4 +13,8 @@
- basic-setup
- liw-usual
- liw-devel-system
+ - obnam-dev-env
+ - python-dev-env
+ - debian-dev-env
+ - qvarnlabs-devel-system
- users
diff --git a/ansible/roles/emacs/tasks/main.yml b/ansible/roles/emacs/tasks/main.yml
new file mode 100644
index 0000000..91ab178
--- /dev/null
+++ b/ansible/roles/emacs/tasks/main.yml
@@ -0,0 +1,8 @@
+- name: install emacs
+ apt: name=emacs
+
+- name: install emacs-goodies-el
+ apt: name=emacs-goodies-el
+
+- name: install debian-el
+ apt: name=debian-el
diff --git a/ansible/roles/liw-devel-system/tasks/main.yml b/ansible/roles/liw-devel-system/tasks/main.yml
index 4575756..44d7221 100644
--- a/ansible/roles/liw-devel-system/tasks/main.yml
+++ b/ansible/roles/liw-devel-system/tasks/main.yml
@@ -1,27 +1,3 @@
-- name: install emacs
- apt: name=emacs
-
-- name: install emacs-goodies-el
- apt: name=emacs-goodies-el
-
-- name: install debian-el
- apt: name=debian-el
-
-- name: install build-essential
- apt: name=build-essential
-
-- name: install devscripts
- apt: name=devscripts
-
-- name: install python-all-dev
- apt: name=python-all-dev
-
-- name: install python3-all-dev
- apt: name=python3-all-dev
-
-- name: install python-meliae
- apt: name=python-meliae
-
- name: install bumper
apt: name=bumper
@@ -31,21 +7,12 @@
- name: install distix
apt: name=distix
-- name: install genbackupdata
- apt: name=genbackupdata
-
- name: install license-summary
apt: name=license-summary
- name: install mr
apt: name=mr
-- name: install pep8
- apt: name=pep8
-
-- name: install pylint
- apt: name=pylint
-
- name: install summain
apt: name=summain
@@ -58,29 +25,5 @@
- name: install ick
apt: name=ick
-- name: install python-coverage-test-runner
- apt: name=python-coverage-test-runner
-
-- name: install python-sphinx
- apt: name=python-sphinx
-
- name: install vmdebootstrap
apt: name=vmdebootstrap
-
-- name: install attr
- apt: name=attr
-
-- name: install python-bottle
- apt: name=python-bottle
-
-- name: install python-uwsgidecorators
- apt: name=python-uwsgidecorators
-
-- name: install python-psycopg2
- apt: name=python-psycopg2
-
-- name: install python-jwt
- apt: name=python-jwt
-
-- name: install python docs
- apt: name=python-doc
diff --git a/ansible/roles/obnam-dev-env/tasks/main.yml b/ansible/roles/obnam-dev-env/tasks/main.yml
index d257c6c..5911846 100644
--- a/ansible/roles/obnam-dev-env/tasks/main.yml
+++ b/ansible/roles/obnam-dev-env/tasks/main.yml
@@ -6,3 +6,6 @@
- name: install summain
apt: name=summain
+
+- name: install attr
+ apt: name=attr
diff --git a/ansible/roles/python-dev-env/tasks/main.yml b/ansible/roles/python-dev-env/tasks/main.yml
index 1ee13e7..76ba1ee 100644
--- a/ansible/roles/python-dev-env/tasks/main.yml
+++ b/ansible/roles/python-dev-env/tasks/main.yml
@@ -42,3 +42,18 @@
- name: install python-coverage-test-runner
apt: name=python-coverage-test-runner
+
+- name: install python-all-dev
+ apt: name=python-all-dev
+
+- name: install python3-all-dev
+ apt: name=python3-all-dev
+
+- name: install python-meliae
+ apt: name=python-meliae
+
+- name: install python-sphinx
+ apt: name=python-sphinx
+
+- name: install python docs
+ apt: name=python-doc
diff --git a/ansible/roles/qvarnlabs-devel-system/tasks/main.yml b/ansible/roles/qvarnlabs-devel-system/tasks/main.yml
index 671caf1..96ae185 100644
--- a/ansible/roles/qvarnlabs-devel-system/tasks/main.yml
+++ b/ansible/roles/qvarnlabs-devel-system/tasks/main.yml
@@ -8,3 +8,15 @@
- name: install qvdoc
apt: name=qvdoc
+
+- name: install python-bottle
+ apt: name=python-bottle
+
+- name: install python-uwsgidecorators
+ apt: name=python-uwsgidecorators
+
+- name: install python-psycopg2
+ apt: name=python-psycopg2
+
+- name: install python-jwt
+ apt: name=python-jwt