Merge branch 'master' into resources-migrate

2015-05-27 13:52:50 +02:00
parent 9228dfcb2d 58b4cac957
commit d8ed61cfa4
24 changed files with 578 additions and 70 deletions
--- a/resources/haproxy_config/meta.yaml
+++ b/resources/haproxy_config/meta.yaml
@@ -3,9 +3,14 @@ handler: none
 version: 1.0.0
 input:
    name:
+      schema: str!
+      value:
    listen_port:
+      schema: int!
+      value:
    ports:
+      schema: [int]
+      value:
    servers:
-input-types:
-    ports: list
-    servers: list
+      schema: [str]
+      value: