Merge branch 'master' into glance-perf

2015-06-12 12:19:00 +02:00 · 2015-06-12 12:19:00 +02:00 · abccbb8922
commit abccbb8922
parent 2d5bff1feb 46959b8d8d
3 changed files with 5 additions and 2 deletions
--- a/.gitignore
+++ b/.gitignore
@ -14,3 +14,6 @@ tmp/
 state/
 clients.json
 rs/
+
+solar.log
+x-venv/
--- a/resources/glance_api_service/actions/run.yml
+++ b/resources/glance_api_service/actions/run.yml
@ -24,4 +24,4 @@
       {% endif %}

    - 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
--- a/resources/keystone_service/meta.yaml
+++ b/resources/keystone_service/meta.yaml
@ -4,7 +4,7 @@ version: 1.0.0
 input:
    image:
      schema: str!
-      value: kollaglue/centos-rdo-k-keystone
+      value: kollaglue/centos-rdo-j-keystone
    config_dir:
      schema: str!
      value: /etc/solar/keystone