Cleanup Ansible playbook

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

ansible/tasks/api.yaml

@@ -1,5 +0,0 @@
----
-- apt: name={{ item }} state=latest
-  with_items:
-    - python-flask
-    - python-flask-sqlalchemy

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

requirements.txt

@@ -6,6 +6,7 @@ mysql
 pillow
 python-daemon
 requests
+flask-sqlalchemy
 flask-restless
 oslo.config
 oslo.log