Remove all f2s specific software from Dockerfile

Dockerfile

@@ -8,22 +8,13 @@ ADD templates /templates
 ADD run.sh /run.sh
 
 RUN apt-get update
-# Install pip's dependency: setuptools:
 RUN apt-get install -y python python-dev python-distribute python-pip \
     libyaml-dev vim libffi-dev libssl-dev
 RUN pip install ansible
 
-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 -U setuptools>=17.1
-RUN pip install -U python-fuelclient
-RUN apt-get install -y puppet
-RUN gem install hiera
-RUN mkdir -p /etc/puppet/hieradata/
-
 CMD ["/run.sh"]

docker-compose.yml

@@ -1,4 +1,4 @@
-solar:
+solar-celery:
   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

solar/core/resource/resource.py

@@ -235,7 +235,7 @@ class Resource(object):
     def resource_inputs(self):
         return self.db_obj.inputs
 
-    def to_dict(self, inputs=True):
+    def to_dict(self, inputs=False):
         ret = self.db_obj.to_dict()
         if inputs:
             ret['inputs'] = self.db_obj.inputs.as_dict()