Use config.py:C in solar and fix compose file

devenv_compose.yaml

@@ -1,22 +0,0 @@
-solar-celery:
-  build: .
-  volumes:
-    - .solar:/solar
-    - .solard:/solard
-    - .templates:/templates
-    - .resources:/resources
-  environment:
-    - REDIS_HOST=10.0.0.2
-    - REDIS_PORT=6379
-    - RIAK_HOST=10.0.0.2
-    - RIAK_PORT=8087
-    - DIRECTORIES=/resources/templates
-riak:
-  image: tutum/riak
-  ports:
-    - 8087:8087
-    - 8098:8098
-redis:
-  image: tutum/redis
-  ports:
-    - 6379:6379

docker-compose.yml

@@ -0,0 +1,29 @@
+solar-celery:
+  image: solar/solar-celery
+  # path inside of the container should be exactly the same as outside
+  # because solar uses absolute path to find resoruce actions files
+  volumes:
+    - /vagrant/.vagrant:/vagrant/.vagrant
+    - /vagrant/solar:/solar
+    - /vagrant/solard:/solard
+    - /vagrant/templates:/vagrant/templates
+    - /vagrant/resources:/vagrant/resources
+  environment:
+    - REDIS_HOST=10.0.0.2
+    - REDIS_PORT=6379
+    - RIAK_HOST=10.0.0.2
+    - RIAK_PORT=8087
+  # links are not used for configuration because we can rely on non-container
+  # based datastores
+  links:
+    - riak
+    - redis
+riak:
+  image: tutum/riak
+  ports:
+    - 8087:8087
+    - 8098:8098
+redis:
+  image: tutum/redis
+  ports:
+    - 6379:6379

solar/solar/config.py

@@ -77,7 +77,6 @@ C.add('redis.host', default='10.0.0.2')
 C.add('riak.host', default='10.0.0.2')
 C.add('riak.port', default='8087')
 C.add('riak.protocol', default='pbc')
-C.add('directories', default=[os.path.dirname(os.path.realpath(__file__))])
 C.init_env()
 
 if __name__ == '__main__':

solar/solar/dblayer/__init__.py

@@ -1,7 +1,9 @@
 from solar.dblayer.model import ModelMeta
 from solar.dblayer.riak_client import RiakClient
+from solar.config import C
 
-client = RiakClient(protocol='pbc', host='10.0.0.2', pb_port=8087)
+client = RiakClient(
+    protocol=C.riak.protcol, host=C.riak.host, pb_port=C.riak.port)
 # client = RiakClient(protocol='http', host='10.0.0.2', http_port=8098)
 
 ModelMeta.setup(client)

solar/solar/orchestration/runner.py

@@ -14,9 +14,13 @@
 
 from celery import Celery
 
+from solar.config import C
+
+_url = 'redis://{}:{}/1'.format(C.redis.host, C.redis.port)
+
 app = Celery(
     include=['solar.system_log.tasks', 'solar.orchestration.tasks'],
-    backend='redis://10.0.0.2:6379/1',
-    broker='redis://10.0.0.2:6379/1')
+    backend=_url,
+    broker=_url)
 app.conf.update(CELERY_ACCEPT_CONTENT = ['json'])
 app.conf.update(CELERY_TASK_SERIALIZER = 'json')

solar/solar/orchestration/tasks.py

@@ -17,7 +17,6 @@ import subprocess
 import time
 
 from celery.app import task
-import redis
 
 from solar.orchestration import graph
 from solar.core import actions
@@ -28,8 +27,6 @@ from solar.orchestration.traversal import traverse
 from solar.orchestration import limits
 from solar.orchestration import executor
 
-r = redis.StrictRedis(host='10.0.0.2', port=6379, db=1)
-
 
 __all__ = ['solar_resource', 'cmd', 'sleep',
            'error', 'fault_tolerance', 'schedule_start', 'schedule_next']