From 1c9e116f4f9dc7dfe5f8b4afc3ec6a4b60a337d5 Mon Sep 17 00:00:00 2001
From: Przemyslaw Kaminski <pkaminski@mirantis.com>
Date: Tue, 28 Apr 2015 11:49:51 +0200
Subject: [PATCH] haproxy-deployment.yaml fixes according to new keystone
 inputs

---
 haproxy_deployment/haproxy-deployment.yaml | 10 ++++++++--
 x/resources/keystone/actions/run.yml       |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/haproxy_deployment/haproxy-deployment.yaml b/haproxy_deployment/haproxy-deployment.yaml
index 91982932..d0350fdb 100755
--- a/haproxy_deployment/haproxy-deployment.yaml
+++ b/haproxy_deployment/haproxy-deployment.yaml
@@ -57,15 +57,21 @@ resources:
   - name: keystone1
     model: x/resources/keystone/
     args:
-      ip:
+      admin_port: 35357
+      port: 5000
       image: TEST
+      config_dir: /etc/solar/keystone1
+      ip:
       ssh_user:
       ssh_key:
   - name: keystone2
     model: x/resources/keystone/
     args:
-      ip:
+      admin_port: 35357
+      port: 5000
+      config_dir: /etc/solar/keystone2
       image: TEST
+      ip:
       ssh_user:
       ssh_key:
   - name: haproxy_keystone_config
diff --git a/x/resources/keystone/actions/run.yml b/x/resources/keystone/actions/run.yml
index 7146e52d..7eb81109 100644
--- a/x/resources/keystone/actions/run.yml
+++ b/x/resources/keystone/actions/run.yml
@@ -9,5 +9,5 @@
         ports:
         - {{ port }}:5000
         - {{ admin_port }}:35357
-        volumnes:
+        volumes:
         - {{ config_dir }}:/etc/keystone