x/solar-resources
Code Issues Proposed changes

Merge branch 'master' into glance-perf

Browse Source
This commit is contained in:
Przemyslaw Kaminski 2015-06-12 12:19:00 +02:00
commit abccbb8922
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -14,3 +14,6 @@ tmp/
state/ state/
clients.json clients.json
rs/ rs/
solar.log
x-venv/

2
resources/glance_api_service/actions/run.yml
View File

@ -24,4 +24,4 @@
{% endif %} {% endif %}
- name: wait for glance api - name: wait for glance api
wait_for: host={{ ip }} port=9393 timeout=20 wait_for: host={{ ip }} port={{ ports.value[0]['value']['value'] }} timeout=20

2
resources/keystone_service/meta.yaml
View File

@ -4,7 +4,7 @@ version: 1.0.0
input: input:
image: image:
schema: str! schema: str!
value: kollaglue/centos-rdo-k-keystone value: kollaglue/centos-rdo-j-keystone
config_dir: config_dir:
schema: str! schema: str!
value: /etc/solar/keystone value: /etc/solar/keystone