aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJun (Nicolas) Hu <jh245g@att.com>2018-05-30 17:25:38 +0000
committerGerrit Code Review <gerrit@onap.org>2018-05-30 17:25:38 +0000
commite68e6f2d2d5e57ef3e2a6d97c4ce531c1ec51c2d (patch)
tree328c7f4aba9c9bfb8e7c566b7663f9eb47eed794
parent5768008d908cb4868652746c6a2aa46437c8c1c2 (diff)
parent140deb9d2dc25326d0377c68af35c7143311f532 (diff)
Merge "Add appc cdt proxy to oom"
-rwxr-xr-xkubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh3
-rw-r--r--kubernetes/appc/templates/service.yaml6
-rw-r--r--kubernetes/appc/values.yaml4
3 files changed, 13 insertions, 0 deletions
diff --git a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
index e13193f364..a990739d55 100755
--- a/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
+++ b/kubernetes/appc/resources/config/appc/opt/onap/appc/bin/startODL.sh
@@ -173,5 +173,8 @@ fi
appcInstallEndTime=$(date +%s)
echo "Total Appc install took $(expr $appcInstallEndTime - $appcInstallStartTime) seconds"
+echo "Starting cdt-proxy-service jar, logging to ${APPC_HOME}/cdt-proxy-service/jar.log"
+java -jar ${APPC_HOME}/cdt-proxy-service/cdt-proxy-service.jar > ${APPC_HOME}/cdt-proxy-service/jar.log &
+
exec ${ODL_HOME}/bin/karaf
diff --git a/kubernetes/appc/templates/service.yaml b/kubernetes/appc/templates/service.yaml
index 6c85985854..0ba73e3984 100644
--- a/kubernetes/appc/templates/service.yaml
+++ b/kubernetes/appc/templates/service.yaml
@@ -31,6 +31,9 @@ spec:
- port: {{ .Values.service.externalPort2 }}
nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
name: "{{ .Values.service.portName }}-1830"
+ - port: {{ .Values.service.externalPort3 }}
+ nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort3 }}
+ name: "{{ .Values.service.portName }}-9090"
{{- else -}}
- port: {{ .Values.service.externalPort }}
targetPort: {{ .Values.service.internalPort }}
@@ -38,6 +41,9 @@ spec:
- port: {{ .Values.service.externalPort2 }}
targetPort: {{ .Values.service.internalPort2 }}
name: {{ .Values.service.portName }}-1830
+ - port: {{ .Values.service.externalPort3 }}
+ targetPort: {{ .Values.service.internalPort3 }}
+ name: {{ .Values.service.portName }}-9090
{{- end}}
selector:
app: {{ include "common.name" . }}
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index 79991f51a4..0d6dffd38c 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -103,6 +103,10 @@ service:
nodePort2: 31
clusterPort: 2550
+ internalPort3: 9191
+ externalPort3: 9090
+ nodePort3: 32
+
## Persist data to a persitent volume
persistence:
enabled: true