Merge pull request #2 from galthaus/pull-req-master-bcbecabbc2

Merge essex-hack back into development. [3/26]
crowbar-archive · May 15, 2012 · 41a6ca8 · 41a6ca8
2 parents 2044332 + bcbecab
commit 41a6ca8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/chef/data_bags/crowbar/bc-template-quantum.json b/chef/data_bags/crowbar/bc-template-quantum.json
@@ -21,7 +21,7 @@
       },
       "api": {
         "service_port": 5000,
-        "service_host": "0.0.0.0",
+        "service_host": "0.0.0.0"
       },
       "admin": {
         "tenant": "admin",

diff --git a/chef/data_bags/crowbar/bc-template-quantum.schema b/chef/data_bags/crowbar/bc-template-quantum.schema
@@ -25,11 +25,7 @@
                     }},
                     "api": { "type": "map", "required": true, "mapping": {
                       "service_port": { "type" : "int", "required" : true },
-                      "api_port": { "type" : "int", "required" : true },
+                      "service_host": { "type" : "str", "required" : true }
-                      "admin_port": { "type" : "int", "required" : true },
-                      "service_host": { "type" : "str", "required" : true },
-                      "api_host": { "type" : "str", "required" : true },
-                      "admin_host": { "type" : "str", "required" : true }
                     }},
                     "admin": { "type": "map", "required": true, "mapping": {
                       "tenant": { "type" : "str", "required" : true },