From d8521c0a97e5b8841247bfd931a363a65b404735 Mon Sep 17 00:00:00 2001
From: Jedrzej Nowak <jnowak@mirantis.com>
Date: Tue, 15 Sep 2015 18:39:26 +0200
Subject: [PATCH] Fixed schemas in haproxy / riak

---
 resources/haproxy_config/meta.yaml         | 10 +++++-----
 resources/haproxy_service/meta.yaml        |  2 +-
 resources/haproxy_service_config/meta.yaml |  4 ++--
 resources/riak_node/actions/run.yaml       |  4 ++--
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/resources/haproxy_config/meta.yaml b/resources/haproxy_config/meta.yaml
index fae284d4..af5858e6 100644
--- a/resources/haproxy_config/meta.yaml
+++ b/resources/haproxy_config/meta.yaml
@@ -9,19 +9,19 @@ input:
       schema: {src: str!, dst: str!}
       value: {src: /etc/solar/haproxy, dst: /etc/haproxy}
     listen_ports:
-      schema: [{value: int}]
+      schema: [int]
       value: []
     configs:
-      schema: [{value: [{value: str}]}]
+      schema: [[str]]
       value: []
     configs_names:
-      schema: [{value: str}]
+      schema: [str]
       value: []
     configs_ports:
-      schema: [{value: [{value: int}]}]
+      schema: [[int]]
       value: []
     configs_protocols:
-      schema: [{value: str}]
+      schema: [str]
       value: []
     ssh_user:
       schema: str!
diff --git a/resources/haproxy_service/meta.yaml b/resources/haproxy_service/meta.yaml
index 4414b807..fac7c862 100644
--- a/resources/haproxy_service/meta.yaml
+++ b/resources/haproxy_service/meta.yaml
@@ -6,7 +6,7 @@ input:
       schema: str!
       value:
     ports:
-      schema: [{value: [{value: int}]}]
+      schema: [[int]]
       value: []
     ssh_user:
       schema: str!
diff --git a/resources/haproxy_service_config/meta.yaml b/resources/haproxy_service_config/meta.yaml
index 1e16619e..88c71742 100644
--- a/resources/haproxy_service_config/meta.yaml
+++ b/resources/haproxy_service_config/meta.yaml
@@ -12,10 +12,10 @@ input:
       schema: str!
       value: http
     ports:
-      schema: [{value: int}]
+      schema: [int]
       value: []
     servers:
-      schema: [{value: str}]
+      schema: [str]
       value: []
 
 tags: [resources/haproxy, resource/haproxy_general_config]
diff --git a/resources/riak_node/actions/run.yaml b/resources/riak_node/actions/run.yaml
index cb553d47..b38d34ea 100644
--- a/resources/riak_node/actions/run.yaml
+++ b/resources/riak_node/actions/run.yaml
@@ -2,8 +2,8 @@
   sudo: yes
   tasks:
     # those below are mostly for tests
-    - shell: killall -u riak
-      ignore_errors: yes
+    # - shell: killall -u riak
+    #   ignore_errors: yes
     # remove above when non tests
 
     # we install ubuntu repo there,