Code Review / oom.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | compact (merge: 462d2b2 c5f034a)
Merge "Moving the trustore to parent folder"
authorBorislav Glozman <Borislav.Glozman@amdocs.com>
Wed, 16 Jan 2019 21:20:03 +0000 (21:20 +0000)
committerGerrit Code Review <gerrit@onap.org>
Wed, 16 Jan 2019 21:20:03 +0000 (21:20 +0000)
1  2 
kubernetes/aai/charts/aai-resources/templates/deployment.yaml patch | diff1 | diff2 | blob | history
kubernetes/aai/charts/aai-traversal/templates/deployment.yaml patch | diff1 | diff2 | blob | history

diff --combined kubernetes/aai/charts/aai-resources/templates/deployment.yaml
index d93ab5a,3a1d6e6..cac8f4b
--- 1/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
--- 2/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-resources/templates/deployment.yaml
@@@ -70,17 -70,6 +70,17 @@@ spec
                "visualRange": "1",
                "path": "/aai/v13/cloud-infrastructure"
            },
 +          {
 +              "serviceName": "_aai-cloudInfrastructure",
 +              "version": "v14",
 +              "url": "/aai/v14/cloud-infrastructure",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/cloud-infrastructure"
 +          },
            {
                "serviceName": "_aai-business",
                "version": "v11",
@@@ -114,17 -103,6 +114,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/business"
            },
 +          {
 +              "serviceName": "_aai-business",
 +              "version": "v14",
 +              "url": "/aai/v14/business",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/business"
 +          },
            {
                "serviceName": "_aai-actions",
                "version": "v11",
@@@ -158,17 -136,6 +158,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/actions"
            },
 +          {
 +              "serviceName": "_aai-actions",
 +              "version": "v14",
 +              "url": "/aai/v14/actions",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/actions"
 +          },
            {
                "serviceName": "_aai-service-design-and-creation",
                "version": "v11",
@@@ -202,17 -169,6 +202,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/service-design-and-creation"
            },
 +          {
 +              "serviceName": "_aai-service-design-and-creation",
 +              "version": "v14",
 +              "url": "/aai/v14/service-design-and-creation",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/service-design-and-creation"
 +          },
            {
                "serviceName": "_aai-network",
                "version": "v11",
@@@ -246,17 -202,6 +246,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/network"
            },
 +          {
 +              "serviceName": "_aai-network",
 +              "version": "v14",
 +              "url": "/aai/v14/network",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/network"
 +          },
            {
                "serviceName": "_aai-externalSystem",
                "version": "v11",
@@@ -267,7 -212,7 +267,7 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1",
                "path": "/aai/v11/external-system"
 -          },      
 +          },
            {
                "serviceName": "_aai-externalSystem",
                "version": "v12",
@@@ -278,7 -223,7 +278,7 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1",
                "path": "/aai/v12/external-system"
 -          },      
 +          },
            {
                "serviceName": "_aai-externalSystem",
                "version": "v13",
@@@ -290,17 -235,6 +290,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/external-system"
            },
 +          {
 +              "serviceName": "_aai-externalSystem",
 +              "version": "v14",
 +              "url": "/aai/v14/external-system",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/external-system"
 +          },
            {
                "serviceName": "aai-cloudInfrastructure",
                "version": "v11",
@@@ -331,16 -265,6 +331,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-cloudInfrastructure",
 +              "version": "v14",
 +              "url": "/aai/v14/cloud-infrastructure",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-business",
                "version": "v11",
@@@ -371,16 -295,6 +371,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-business",
 +              "version": "v14",
 +              "url": "/aai/v14/business",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-actions",
                "version": "v11",
@@@ -411,16 -325,6 +411,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-actions",
 +              "version": "v14",
 +              "url": "/aai/v14/actions",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-service-design-and-creation",
                "version": "v11",
@@@ -451,16 -355,6 +451,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-service-design-and-creation",
 +              "version": "v14",
 +              "url": "/aai/v14/service-design-and-creation",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-network",
                "version": "v11",
@@@ -491,16 -385,6 +491,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-network",
 +              "version": "v14",
 +              "url": "/aai/v14/network",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-externalSystem",
                "version": "v11",
@@@ -510,7 -394,7 +510,7 @@@
                "enable_ssl": true,
                "lb_policy":"ip_hash",
                "visualRange": "1"
 -          },      
 +          },
            {
                "serviceName": "aai-externalSystem",
                "version": "v12",
@@@ -520,7 -404,7 +520,7 @@@
                "enable_ssl": true,
                "lb_policy":"ip_hash",
                "visualRange": "1"
 -          },      
 +          },
            {
                "serviceName": "aai-externalSystem",
                "version": "v13",
@@@ -530,16 -414,6 +530,16 @@@
                "enable_ssl": true,
                "lb_policy":"ip_hash",
                "visualRange": "1"
 +          },
 +          {
 +              "serviceName": "aai-externalSystem",
 +              "version": "v14",
 +              "url": "/aai/v14/external-system",
 +              "protocol": "REST",
 +              "port": "8447",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
            }
            ]'
      spec:
@@@ -641,7 -515,7 +641,7 @@@
            name: {{ include "common.fullname" . }}-aaf-certs
            subPath: org.onap.aai.p12
          - mountPath: /opt/app/aai-resources/resources/aaf/truststoreONAPall.jks
-           name: {{ include "common.fullname" . }}-aaf-certs
+           name: aai-common-aai-auth-mount
            subPath: truststoreONAPall.jks
          - mountPath: /opt/app/aai-resources/resources/application.properties
            name: {{ include "common.fullname" . }}-springapp-conf
@@@ -773,6 -647,9 +773,9 @@@
      {{ end }}
  
        volumes:
+       - name: aai-common-aai-auth-mount
+         secret:
+           secretName: aai-common-aai-auth
        - name: localtime
          hostPath:
            path: /etc/localtime
diff --combined kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
index 84dd900,19f21d3..3785de0
--- 1/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
--- 2/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
+++ b/kubernetes/aai/charts/aai-traversal/templates/deployment.yaml
@@@ -70,17 -70,6 +70,17 @@@ spec
                "visualRange": "1",
                "path": "/aai/v13/search/generic-query"
            },
 +          {
 +              "serviceName": "_aai-generic-query",
 +              "version": "v14",
 +              "url": "/aai/v14/search/generic-query",
 +              "protocol": "REST",
 +              "port": "8446",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/search/generic-query"
 +          },
            {
                "serviceName": "_aai-nodes-query",
                "version": "v11",
@@@ -114,17 -103,6 +114,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/search/nodes-query"
            },
 +          {
 +              "serviceName": "_aai-nodes-query",
 +              "version": "v14",
 +              "url": "/aai/v14/search/nodes-query",
 +              "protocol": "REST",
 +              "port": "8446",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/search/nodes-query"
 +          },
            {
                "serviceName": "_aai-query",
                "version": "v11",
@@@ -158,17 -136,6 +158,17 @@@
                "visualRange": "1",
                "path": "/aai/v13/query"
            },
 +          {
 +              "serviceName": "_aai-query",
 +              "version": "v14",
 +              "url": "/aai/v14/query",
 +              "protocol": "REST",
 +              "port": "8446",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1",
 +              "path": "/aai/v14/query"
 +          },
            {
                "serviceName": "_aai-named-query",
                "url": "/aai/search",
@@@ -209,16 -176,6 +209,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-generic-query",
 +              "version": "v14",
 +              "url": "/aai/v14/search/generic-query",
 +              "protocol": "REST",
 +              "port": "8446",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-nodes-query",
                "version": "v11",
@@@ -249,16 -206,6 +249,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-nodes-query",
 +              "version": "v14",
 +              "url": "/aai/v14/search/nodes-query",
 +              "protocol": "REST",
 +              "port": "8446",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-query",
                "version": "v11",
@@@ -289,16 -236,6 +289,16 @@@
                "lb_policy":"ip_hash",
                "visualRange": "1"
            },
 +          {
 +              "serviceName": "aai-query",
 +              "version": "v14",
 +              "url": "/aai/v14/query",
 +              "protocol": "REST",
 +              "port": "8446",
 +              "enable_ssl": true,
 +              "lb_policy":"ip_hash",
 +              "visualRange": "1"
 +          },
            {
                "serviceName": "aai-named-query",
                "url": "/aai/search",
@@@ -392,7 -329,7 +392,7 @@@
            name: {{ include "common.fullname" . }}-aaf-certs
            subPath: org.onap.aai.p12
          - mountPath: /opt/app/aai-traversal/resources/aaf/truststoreONAPall.jks
-           name: {{ include "common.fullname" . }}-aaf-certs
+           name: aai-common-aai-auth-mount
            subPath: truststoreONAPall.jks
          - mountPath: /opt/app/aai-traversal/resources/application.properties
            name: {{ include "common.fullname" . }}-springapp-conf
@@@ -475,6 -412,9 +475,9 @@@
        - name: {{ include "common.fullname" . }}-aaf-certs
          secret:
           secretName: {{ include "common.fullname" . }}-aaf-keys
+       - name: aai-common-aai-auth-mount
+         secret:
+           secretName: aai-common-aai-auth
        - name: {{ include "common.fullname" . }}-springapp-conf
          configMap:
           name: {{ include "common.fullname" . }}-springapp-configmap
Introduces the ONAP Platform OOM (ONAP Operations Manager) to efficiently Deploy, Manage, Operate the ONAP platform and its components (e.g. MSO, DCAE, SDC, etc.) and infrastructure (VMs, Containers).