Adjust docker to use f2s and small fixes

Dockerfile

@@ -11,12 +11,17 @@ ADD bootstrap/playbooks/celery.yaml /celery.yaml
 ADD resources /resources
 ADD templates /templates
 ADD run.sh /run.sh
+ADD f2s /f2s
 
 
 RUN apt-get install -y libffi-dev libssl-dev
+
 RUN pip install https://github.com/Mirantis/solar/archive/master.zip
 RUN pip install https://github.com/Mirantis/solar-agent/archive/master.zip
 
 RUN ansible-playbook -v -i "localhost," -c local /celery.yaml --tags install
+RUN pip install riak peewee
+RUN pip install -U setuptools>=17.1
+RUN pip install -U python-fuelclient
 
 CMD ["/run.sh"]

docker-compose.yml

@@ -1,4 +1,4 @@
-solar-celery:
+solar:
   image: solarproject/solar-celery
   # path inside of the container should be exactly the same as outside
   # because solar uses absolute path to find resoruce actions files

f2s/.gitignore

@@ -1,2 +1,2 @@
 fuel-library
-tmp/
+tmp

f2s/fsclient.py

@@ -30,7 +30,7 @@ class DumbSource(object):
         return 'primary-controller'
 
     def master(self):
-        return 'master', '10.0.1.1'
+        return 'master', '0.0.0.0'
 
 source = DumbSource()
 
@@ -65,7 +65,7 @@ def roles(uids):
     for uid, ip, env in source.nodes(uids):
         role = source.roles(uid)
         vr.create(role, 'f2s/vrs/'+role,
-            {'index': uid, 'env': 'env', 'node': 'node'+uid})
+            {'index': uid, 'env': env, 'node': 'node'+uid})
 
 
 if __name__ == '__main__':