From: Mike Elliott Date: Thu, 24 May 2018 13:11:50 +0000 (+0000) Subject: Merge "Fix Incorrect AAI services" X-Git-Tag: 2.0.0-ONAP~63 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=57326c615966a14f24d7b7a5ac84e51c1b73e0b0;hp=2d4426e022588345d2f1eea6aa609f236dd6b595;p=oom.git Merge "Fix Incorrect AAI services" --- diff --git a/TOSCA/Helm/onap-blueprint.yaml b/TOSCA/Helm/onap-blueprint.yaml index 3ac76fa8b1..c5b699b5be 100644 --- a/TOSCA/Helm/onap-blueprint.yaml +++ b/TOSCA/Helm/onap-blueprint.yaml @@ -347,3 +347,13 @@ node_templates: relationships: - type: cloudify.relationships.connected_to target: k8s_env + + nbi: + type: cloudify.nodes.Helm + properties: + args: + - { get_input: namespace } + - nbi + relationships: + - type: cloudify.relationships.connected_to + target: k8s_env \ No newline at end of file diff --git a/docs/oom_user_guide.rst b/docs/oom_user_guide.rst index bb8ff0b27c..fbd3d9ea97 100644 --- a/docs/oom_user_guide.rst +++ b/docs/oom_user_guide.rst @@ -196,7 +196,7 @@ Many technologies are used across the projects resulting in significant operational complexity and an inability to apply global parameters across the entire ONAP deployment. OOM solves this problem by introducing a common configuration technology, Helm charts, that provide a hierarchical -configuration configuration with the ability to override values with higher +configuration with the ability to override values with higher level charts or command line options. The structure of the configuration of ONAP is shown in the following diagram. @@ -420,10 +420,10 @@ to monitor the real-time health of an ONAP deployment: - a set of liveness probes which feed into the Kubernetes manager which are described in the Heal section. -Within ONAP Consul is the monitoring system of choice and deployed by OOM in two parts: +Within ONAP, Consul is the monitoring system of choice and deployed by OOM in two parts: - a three-way, centralized Consul server cluster is deployed as a highly - available monitor of all of the ONAP components,and + available monitor of all of the ONAP components, and - a number of Consul agents. The Consul server provides a user interface that allows a user to graphically diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml index 71752fcfc6..751e4a0c11 100644 --- a/kubernetes/clamp/values.yaml +++ b/kubernetes/clamp/values.yaml @@ -48,8 +48,8 @@ config: "clamp.config.sdc.serviceUsername": "clamp", "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981", "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json", - "clamp.config.dcae.inventory.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080", - "clamp.config.dcae.dispatcher.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080", + "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080", + "clamp.config.dcae.dispatcher.url": "http://deployment-handler.{{ include "common.namespace" . }}:8443", "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123", "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123", "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:8443/pap/ , testpap, alpha123", diff --git a/kubernetes/cli/values.yaml b/kubernetes/cli/values.yaml index dd034f7b76..bd52ced25f 100644 --- a/kubernetes/cli/values.yaml +++ b/kubernetes/cli/values.yaml @@ -59,7 +59,7 @@ service: internalPort: "80" internalPort1: 8080 nodePort: "60" - nodePort1: "61" + nodePort1: "71" ingress: enabled: false diff --git a/kubernetes/common/dgbuilder/templates/deployment.yaml b/kubernetes/common/dgbuilder/templates/deployment.yaml index b9c90f2681..328e058f5c 100644 --- a/kubernetes/common/dgbuilder/templates/deployment.yaml +++ b/kubernetes/common/dgbuilder/templates/deployment.yaml @@ -60,16 +60,16 @@ spec: mountPath: /opt/app/application.properties subPath: application.properties - name: config - mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/conf/svclogic.properties + mountPath: /opt/onap/ccsdk/dgbuilder/releases/sdnc1.0/conf/svclogic.properties subPath: svclogic.properties - name: config - mountPath: /opt/onap/sdnc/dgbuilder/svclogic/svclogic.properties + mountPath: /opt/onap/ccsdk/dgbuilder/svclogic/svclogic.properties subPath: svclogic.properties - name: scripts - mountPath: /opt/onap/sdnc/dgbuilder/createReleaseDir.sh + mountPath: /opt/onap/ccsdk/dgbuilder/createReleaseDir.sh subPath: createReleaseDir.sh - name: scripts - mountPath: /opt/onap/sdnc/dgbuilder/releases/sdnc1.0/customSettings.js + mountPath: /opt/onap/ccsdk/dgbuilder/releases/sdnc1.0/customSettings.js subPath: customSettings.js resources: {{ toYaml .Values.resources | indent 12 }} diff --git a/kubernetes/esr/charts/esr-gui/values.yaml b/kubernetes/esr/charts/esr-gui/values.yaml index 23ac080ab1..610d9eb17b 100644 --- a/kubernetes/esr/charts/esr-gui/values.yaml +++ b/kubernetes/esr/charts/esr-gui/values.yaml @@ -23,7 +23,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/aai/esr-gui:1.1.0-SNAPSHOT +image: onap/aai/esr-gui:latest pullPolicy: Always msbaddr: msb-iag.{{ include "common.namespace" . }}:80 diff --git a/kubernetes/esr/values.yaml b/kubernetes/esr/values.yaml index 750bcffa20..baa2155375 100644 --- a/kubernetes/esr/values.yaml +++ b/kubernetes/esr/values.yaml @@ -27,7 +27,7 @@ subChartsOnly: # application image repository: nexus3.onap.org:10001 -image: onap/aai/esr-server:1.1.0-SNAPSHOT +image: onap/aai/esr-server:latest pullPolicy: Always msbaddr: msb-iag.{{ include "common.namespace" . }}:80 diff --git a/kubernetes/nbi/templates/deployment.yaml b/kubernetes/nbi/templates/deployment.yaml index 42d610f351..06572492fd 100644 --- a/kubernetes/nbi/templates/deployment.yaml +++ b/kubernetes/nbi/templates/deployment.yaml @@ -76,13 +76,13 @@ spec: - name: NBI_URL value: "http://nbi.{{ include "common.namespace" . }}:8080/nbi/api/v1" - name: SDC_HOST - value: "http://sdc-fe.{{ include "common.namespace" . }}:8080" + value: "http://sdc-be.{{ include "common.namespace" . }}:8080" - name: SDC_HEADER_ECOMPINSTANCEID value: {{ .Values.config.ecompInstanceId }} - name: SDC_HEADER_AUTHORIZATION value: {{ .Values.sdc_authorization }} - name: AAI_HOST - value: "http://aai.{{ include "common.namespace" . }}:8443" + value: "https://aai.{{ include "common.namespace" . }}:8443" - name: AAI_HEADER_AUTHORIZATION value: {{ .Values.aai_authorization }} - name: SO_HOST diff --git a/kubernetes/nbi/values.yaml b/kubernetes/nbi/values.yaml index 5557edf697..709e580d27 100644 --- a/kubernetes/nbi/values.yaml +++ b/kubernetes/nbi/values.yaml @@ -97,7 +97,7 @@ service: type: NodePort portName: api name: nbi - nodePort: 64 + nodePort: 74 internalPort: 8080 ingress: diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml index 9b10012879..7a988a532f 100644 --- a/kubernetes/onap/resources/environments/dev.yaml +++ b/kubernetes/onap/resources/environments/dev.yaml @@ -78,6 +78,8 @@ msb: enabled: false multicloud: enabled: false +nbi: + enabled: false policy: enabled: false portal: diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml index 0f669beaab..8b66dab319 100644 --- a/kubernetes/onap/resources/environments/disable-allcharts.yaml +++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml @@ -51,6 +51,8 @@ msb: enabled: false multicloud: enabled: false +nbi: + enabled: false oof: enabled: false policy: diff --git a/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf b/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf index f5f4060aad..7f894fd4a9 100644 --- a/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf +++ b/kubernetes/policy/charts/pdp/resources/config/pe/pdplp.conf @@ -18,8 +18,8 @@ LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 SERVER=http://{{ include "common.servicename" . }}:{{.Values.service.externalPort}}/pdp/ -LOGPATH=/opt/app/policy/servers/pdp/logs/pdp-rest.log -PARSERLOGPATH=IntegrityMonitor.log +LOGPATH=/var/log/onap/policy/pdpx/pdp-rest.log +PARSERLOGPATH=/opt/app/policy/servers/pdplp/bin/IntegrityMonitor.log node_type=logparser # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase diff --git a/kubernetes/policy/resources/config/pe/paplp.conf b/kubernetes/policy/resources/config/pe/paplp.conf index 205497c35d..3d59d818c9 100644 --- a/kubernetes/policy/resources/config/pe/paplp.conf +++ b/kubernetes/policy/resources/config/pe/paplp.conf @@ -18,8 +18,8 @@ LOGPARSER_X_MS_MB=1024 LOGPARSER_X_MX_MB=1024 SERVER=http://{{ include "common.servicename" . }}:{{.Values.service.externalPort2}}/pap/ -LOGPATH=/opt/app/policy/servers/pap/logs/pap-rest.log -PARSERLOGPATH=IntegrityMonitor.log +LOGPATH=/var/log/onap/policy/pap/pap-rest.log +PARSERLOGPATH=/opt/app/policy/servers/paplp/bin/IntegrityMonitor.log node_type=logparser # the java property is RESOURCE_NAME (uppercase), but the conf parameter is lowercase diff --git a/kubernetes/portal/charts/portal-mariadb/values.yaml b/kubernetes/portal/charts/portal-mariadb/values.yaml index ae5849eb27..fc4836bf07 100644 --- a/kubernetes/portal/charts/portal-mariadb/values.yaml +++ b/kubernetes/portal/charts/portal-mariadb/values.yaml @@ -77,14 +77,14 @@ affinity: {} # probe configuration parameters liveness: - initialDelaySeconds: 300 + initialDelaySeconds: 450 periodSeconds: 10 # necessary to disable liveness probe when setting breakpoints # in debugger so K8s doesn't restart unresponsive container enabled: true readiness: - initialDelaySeconds: 300 + initialDelaySeconds: 450 periodSeconds: 10 ## Persist data to a persitent volume