Merge pull request #21 from totem/develop

0.1.7 Release
totem · Mar 5, 2015 · 71fa514 · 71fa514
2 parents 0df3465 + dc50038
commit 71fa514
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/orchestrator/__init__.py b/orchestrator/__init__.py
@@ -1,7 +1,7 @@
 import logging
 from conf.appconfig import LOG_FORMAT, LOG_DATE, LOG_ROOT_LEVEL
 
-__version__ = '0.1.6'
+__version__ = '0.1.7'
 __author__ = 'sukrit'
 
 logging.basicConfig(format=LOG_FORMAT, datefmt=LOG_DATE, level=LOG_ROOT_LEVEL)

diff --git a/schemas/job-config-v1.json b/schemas/job-config-v1.json
@@ -252,8 +252,16 @@
       "type": "object",
       "properties": {
         "hostname": {
-          "description": "Hostname to be registered with proxy.",
-          "$ref": "#/definitions/string-or-template-type"
+          "description": "Hostname(s) to be registered with proxy. If multiple hosts needs to be specified, separate them using comma or space",
+          "oneOf": [
+            {
+              "type": "string",
+              "pattern": "^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9])(\\.([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\\-]{0,61}[a-zA-Z0-9]))*[\\s,]*)+$"
+            },
+            {
+              "$ref": "#/definitions/template-type"
+            }
+          ]
         },
         "locations": {
           "description": "Locations for given proxy host.",