Fix swagger basepath

Change-Id: I59263971e1c46096663322ecb2937a79c084cf10
Issue-ID: SDC-534
Signed-off-by: Tal Gitelman <tg851x@intl.att.com>

diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index d68817f..70f5ff2 100644 (file)
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -95,7 +95,7 @@
                
                <init-param>
                        <param-name>swagger.api.basepath</param-name>
-                       <param-value>:8080/sdc2/rest</param-value>
+                       <param-value>/sdc2/rest</param-value>
                </init-param>
                
                <init-param>
@@ -129,7 +129,7 @@
        <init-param>
                        <param-name>swagger.api.basepath</param-name>
                        <!-- Check if second param can be added -->
-                       <param-value>:8080/sdc</param-value>
+                       <param-value>/sdc</param-value>
                </init-param>
                
                <init-param>

diff --git a/sdc-os-chef/environments/Template.json b/sdc-os-chef/environments/Template.json
index fd3b683..6052d68 100644 (file)
--- a/sdc-os-chef/environments/Template.json
+++ b/sdc-os-chef/environments/Template.json
@@ -8,7 +8,7 @@
    "chef_type": "environment",
 
    "default_attributes": {
-               "disableHttp": false,
+        "disableHttp": false,
         "CS_VIP": "yyy",
         "BE_VIP": "yyy",
         "FE_VIP": "yyy",