Merge "Small cleanups"

bootstrap/playbooks/solar.yaml

@@ -61,7 +61,14 @@
     - file: src=/vagrant/solar-resources/templates dest=/var/lib/solar/repositories/templates state=link owner=vagrant
 
     - name: start riak container
-      shell: docker-compose up -d riak chdir=/vagrant
+      docker:
+        name: vagrant_riak_1
+        image: solarproject/riak
+        volumes:
+            - /vagrant/utils/riak/app.config:/etc/riak/app.config
+        ports:
+          - 8087:8087
+          - 8098:8098
     # preconfigure docker container
     # add counters datatype etc.
     - shell: timeout 60 docker exec vagrant_riak_1 riak-admin wait_for_service riak_kv

bootstrap/playbooks/tasks/base.yaml

@@ -7,7 +7,6 @@
   with_items:
   - git
   - subversion
-  - python-mock
   - python-keystoneclient
   - python-mysqldb
   - python-setuptools
@@ -39,18 +38,21 @@
   # for tests on jenkins
   - sshpass
 
+- name: Uninstall packages
+  apt: name={{ item }} state=absent
+  with_items:
+  - python-pbr
 
 # PIP
-- shell: sudo pip install httpie
+- pip: name={{item}} state=present
-- shell: sudo pip install docker-py==1.1.0
+  with_items:
+  - httpie
+  - docker-py==1.1.0
+  - ujson
+  - tox
+  - riak
+  - pbr
+
 # pre install solare requirements
 - shell: pip install -r https://raw.githubusercontent.com/openstack/solar/master/requirements.txt
-
+- shell: pip install -r https://raw.githubusercontent.com/Mirantis/solar-agent/master/requirements.txt
-# faster json
-- shell: pip install ujson
-
-# fresh tox
-- shell: sudo pip install tox
-
-# install riak package
-- shell: sudo pip install riak

bootstrap/playbooks/tasks/docker.yaml

@@ -16,9 +16,5 @@
 #- shell: apt-get update
 #- shell: apt-get install -y -q docker-engine
 
-# install docker compose
-- shell: curl -L https://github.com/docker/compose/releases/download/1.5.1/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose
-- shell: chmod +x /usr/local/bin/docker-compose
-
 # pre download riak image
 - shell: docker pull solarproject/riak

bootstrap/playbooks/tasks/worker_upstart.yaml

@@ -2,4 +2,6 @@
 
 - copy: src=/vagrant/utils/solar-worker-defaults dest=/etc/default/solar-worker
 - copy: src=/vagrant/utils/solar-worker.conf dest=/etc/init/solar-worker.conf
+- shell: stop solar-worker
+  ignore_errors: yes
 - shell: start solar-worker

docker-compose.yml

@@ -1,7 +0,0 @@
-riak:
-  image: solarproject/riak
-  volumes:
-    - ./utils/riak/app.config:/etc/riak/app.config
-  ports:
-    - 8087:8087
-    - 8098:8098