Merge "create K8S cluster by TOSCA"

[oom.git] / kubernetes / aai / templates / all-services.yaml

diff --git a/kubernetes/aai/templates/all-services.yaml b/kubernetes/aai/templates/all-services.yaml
index df7e356..77f7dc1 100644 (file)
--- a/kubernetes/aai/templates/all-services.yaml
+++ b/kubernetes/aai/templates/all-services.yaml
@@ -43,8 +43,8 @@ metadata:
           "url": "/aai/v11/cloud-infrastructure",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1"
+          "enable_ssl": true,
+          "visualRange": "1"
       },
       {
           "serviceName": "aai-cloudInfrastructure-deprecated",
@@ -52,9 +52,9 @@ metadata:
           "url": "/aai/v11/cloud-infrastructure",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1",
-          "path":"/aai/v11/cloud-infrastructure"
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/cloud-infrastructure"
       },
       {
           "serviceName": "aai-business",
@@ -62,8 +62,8 @@ metadata:
           "url": "/aai/v11/business",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1"
+          "enable_ssl": true,
+          "visualRange": "1"
       },
       {
           "serviceName": "aai-business-deprecated",
@@ -71,9 +71,9 @@ metadata:
           "url": "/aai/v11/business",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1",
-          "path":"/aai/v11/business"
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/business"
       },
       {
           "serviceName": "aai-search",
@@ -81,8 +81,8 @@ metadata:
           "url": "/aai/v11/search",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1"
+          "enable_ssl": true,
+          "visualRange": "1"
       },
       {
           "serviceName": "aai-search-deprecated",
@@ -90,9 +90,9 @@ metadata:
           "url": "/aai/v11/search",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1",
-          "path":"/aai/v11/search"
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/search"
       },
       {
           "serviceName": "aai-actions",
@@ -100,8 +100,8 @@ metadata:
           "url": "/aai/v11/actions",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1"
+          "enable_ssl": true,
+          "visualRange": "1"
       },
       {
           "serviceName": "aai-actions-deprecated",
@@ -109,9 +109,9 @@ metadata:
           "url": "/aai/v11/actions",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1",
-          "path":"/aai/v11/actions"
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/actions"
       },
       {
           "serviceName": "aai-service-design-and-creation",
@@ -119,8 +119,8 @@ metadata:
           "url": "/aai/v11/service-design-and-creation",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1"
+          "enable_ssl": true,
+          "visualRange": "1"
       },
       {
           "serviceName": "aai-service-design-and-creation-deprecated",
@@ -128,9 +128,9 @@ metadata:
           "url": "/aai/v11/service-design-and-creation",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1",
-          "path":"/aai/v11/service-design-and-creation"
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/service-design-and-creation"
       },
       {
           "serviceName": "aai-network",
@@ -138,8 +138,8 @@ metadata:
           "url": "/aai/v11/network",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1"
+          "enable_ssl": true,
+          "visualRange": "1"
       },
       {
           "serviceName": "aai-network-deprecated",
@@ -147,9 +147,28 @@ metadata:
           "url": "/aai/v11/network",
           "protocol": "REST",
           "port": "8443",
-          "enable_ssl":"True",
-          "visualRange":"1",
-          "path":"/aai/v11/network"
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/network"
+      },
+      {
+          "serviceName": "aai-externalSystem",
+          "version": "v11",
+          "url": "/aai/v11/external-system",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl": true,
+          "visualRange": "1"
+      },
+      {
+          "serviceName": "aai-externalSystem-deprecated",
+          "version": "v11",
+          "url": "/aai/v11/external-system",
+          "protocol": "REST",
+          "port": "8443",
+          "enable_ssl": true,
+          "visualRange": "1",
+          "path": "/aai/v11/external-system"
       }
       ]'
 spec:
@@ -165,6 +184,7 @@ spec:
   type: NodePort
   selector:
     app: aai-service
+  clusterIP: {{ .Values.aaiServiceClusterIp }}
 #{{ end }}
 #{{ if not .Values.disableAaiModelLoaderService }}
 ---