x/solar
Code Issues Proposed changes

Adjust docker to use f2s and small fixes

Browse Source
This commit is contained in:
Dmitry Shulyak 2015-11-11 14:07:37 +02:00
parent 2019c35843
commit 9cf2b89e41
4 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Dockerfile
View File

@ -11,12 +11,17 @@ ADD bootstrap/playbooks/celery.yaml /celery.yaml
ADD resources /resources ADD resources /resources
ADD templates /templates ADD templates /templates
ADD run.sh /run.sh ADD run.sh /run.sh
ADD f2s /f2s
RUN apt-get install -y libffi-dev libssl-dev 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 riak peewee
RUN pip install -U setuptools>=17.1
RUN pip install -U python-fuelclient
CMD ["/run.sh"] CMD ["/run.sh"]

2
docker-compose.yml
View File

@ -1,4 +1,4 @@
solar-celery: solar:
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
f2s/.gitignore vendored
View File

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

4
f2s/fsclient.py
View File

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