From 7b045c93931556801fe7ff0f6608756f0bddaccc Mon Sep 17 00:00:00 2001
From: Christian Berendt <christian@berendt.io>
Date: Sat, 7 Mar 2015 12:50:59 +0100
Subject: [PATCH] Cleanup Ansible playbook

---
 ansible/playbook.yaml       | 32 +++++++++++++++++---------------
 ansible/tasks/api.yaml      |  5 -----
 ansible/tasks/database.yaml |  2 +-
 requirements.txt            |  1 +
 4 files changed, 19 insertions(+), 21 deletions(-)
 delete mode 100644 ansible/tasks/api.yaml

diff --git a/ansible/playbook.yaml b/ansible/playbook.yaml
index 0e9d13f..23bf535 100644
--- a/ansible/playbook.yaml
+++ b/ansible/playbook.yaml
@@ -3,7 +3,7 @@
 
   tasks:
   - apt: update-cache=yes upgrade=yes
-  - include: tasks/api.yaml tags=api
+
   - include: tasks/database.yaml tags=database
   - include: tasks/messaging.yaml tags=messaging
   - include: tasks/webinterface.yaml tags=webinterface
@@ -12,33 +12,35 @@
     with_items:
       - git
       - libmysqlclient-dev
-      - python-daemon
       - python-dev
-      - python-kombu
-      - python-pbr
-      - python-pillow
-      - python-requests
       - python-virtualenv
     tags:
-      - worker
+      - api
       - producer
       - tracker
+      - worker
+
+  - command: pip install -r /vagrant/requirements.txt
+    tags:
       - api
+      - producer
+      - tracker
+      - worker
 
   - command: python setup.py install
     args:
       chdir: /vagrant
     tags:
-      - worker
+      - api
       - producer
       - tracker
-      - api
+      - worker
 
-  - copy: src=files/run_worker.sh dest=/home/vagrant/run_worker.sh mode=0755
-    tags: worker
-  - copy: src=files/run_tracker.sh dest=/home/vagrant/run_tracker.sh mode=0755
-    tags: tracker
-  - copy: src=files/run_producer.sh dest=/home/vagrant/run_producer.sh mode=0755
-    tags: producer
   - copy: src=files/run_api.sh dest=/home/vagrant/run_api.sh mode=0755
     tags: api
+  - copy: src=files/run_producer.sh dest=/home/vagrant/run_producer.sh mode=0755
+    tags: producer
+  - copy: src=files/run_tracker.sh dest=/home/vagrant/run_tracker.sh mode=0755
+    tags: tracker
+  - copy: src=files/run_worker.sh dest=/home/vagrant/run_worker.sh mode=0755
+    tags: worker
diff --git a/ansible/tasks/api.yaml b/ansible/tasks/api.yaml
deleted file mode 100644
index 12e4239..0000000
--- a/ansible/tasks/api.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- apt: name={{ item }} state=latest
-  with_items:
-    - python-flask
-    - python-flask-sqlalchemy
diff --git a/ansible/tasks/database.yaml b/ansible/tasks/database.yaml
index 1cecf7f..58d5f09 100644
--- a/ansible/tasks/database.yaml
+++ b/ansible/tasks/database.yaml
@@ -16,8 +16,8 @@
 - mysql_db: name=tutorial state=present
 - mysql_user: name=tutorial password=secretsecret priv=*.*:ALL host={{ item }} state=present
   with_items:
+    - api
     - localhost
     - producer
     - tracker
     - worker
-    - api
diff --git a/requirements.txt b/requirements.txt
index d11e5a1..f039b99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ mysql
 pillow
 python-daemon
 requests
+flask-sqlalchemy
 flask-restless
 oslo.config
 oslo.log