x/solar
Code Issues Proposed changes

Remove all f2s specific software from Dockerfile

Browse Source
This commit is contained in:
Dmitry Shulyak 2015-12-01 15:49:07 +02:00
parent f1a3b1afca
commit 3c1e3b0b03
3 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Dockerfile
View File

@ -8,22 +8,13 @@ ADD templates /templates
ADD run.sh /run.sh ADD run.sh /run.sh
RUN apt-get update RUN apt-get update
# Install pip's dependency: setuptools:
RUN apt-get install -y python python-dev python-distribute python-pip \ RUN apt-get install -y python python-dev python-distribute python-pip \
libyaml-dev vim libffi-dev libssl-dev libyaml-dev vim libffi-dev libssl-dev
RUN pip install ansible 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/archive/master.zip
RUN pip install https://github.com/Mirantis/solar-agent/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 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"] CMD ["/run.sh"]

2
docker-compose.yml
View File

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

2
solar/core/resource/resource.py
View File

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