From 7b0d6c656717546000089406ea09aa11e0eb9d82 Mon Sep 17 00:00:00 2001 From: Neha Jain Date: Thu, 17 May 2018 14:34:49 -0400 Subject: [PATCH] Multi-site High-availability Manual Failover (PoC) Change-Id: I9f1417a77b0e3cae23f55b1bfc1d419730d8f9cd Signed-off-by: Neha Jain Issue-ID: SDNC-214 --- kubernetes/common/mysql/templates/service.yaml | 10 +++++----- kubernetes/common/mysql/values.yaml | 3 +++ kubernetes/sdnc/values.yaml | 2 ++ 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/kubernetes/common/mysql/templates/service.yaml b/kubernetes/common/mysql/templates/service.yaml index ed4f72adc5..dc63e31029 100644 --- a/kubernetes/common/mysql/templates/service.yaml +++ b/kubernetes/common/mysql/templates/service.yaml @@ -115,15 +115,15 @@ metadata: statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0 spec: ports: - - name: {{ .Values.service.internalPort }} + - name: {{ .Values.service.portName | default .Values.service.name }}-1 port: {{ .Values.service.internalPort }} targetPort: {{ .Values.service.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort1 }} - - name: {{ .Values.xtrabackup.internalPort }} + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodeport1 }} + - name: {{ .Values.service.portName | default .Values.service.name }}-2 port: {{ .Values.xtrabackup.internalPort }} targetPort: {{ .Values.xtrabackup.internalPort }} - nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.externalPort2 }} - type: NodePort + nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodeport2 }} + type: {{ .Values.service.type }} selector: statefulset.kubernetes.io/pod-name: {{ include "common.fullname" . }}-0 release: {{ .Release.Name }} diff --git a/kubernetes/common/mysql/values.yaml b/kubernetes/common/mysql/values.yaml index b12e72d0a2..6805aa5e6c 100644 --- a/kubernetes/common/mysql/values.yaml +++ b/kubernetes/common/mysql/values.yaml @@ -87,6 +87,9 @@ service: mountdPort: 20048 rpcbindPort: 111 rpcbindUdpPort: 111 + type: NodePort + nodeport1: 72 + nodeport2: 73 ingress: enabled: false diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index a550b22e11..89d6f7cc72 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -43,6 +43,7 @@ config: enableClustering: true binDir: /opt/onap/sdnc/bin geoEnabled: false +# if geoEnabled is set to true here, mysql.geoEnabled must be set to true # if geoEnabled is set to true the following 3 values must be set to their proper values myODLCluster: 127.0.0.1 peerODLCluster: 127.0.0.1 @@ -103,6 +104,7 @@ mysql: enabled: true disableNfsProvisioner: true replicaCount: 1 + geoEnabled: false dgbuilder: nameOverride: sdnc-dgbuilder -- 2.16.6