diff options
Diffstat (limited to 'kubernetes/sdnc')
| -rw-r--r-- | kubernetes/sdnc/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/dmaap-listener/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/dmaap-listener/requirements.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/sdnc-portal/requirements.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/ueb-listener/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/charts/ueb-listener/requirements.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/requirements.yaml | 12 | ||||
| -rw-r--r-- | kubernetes/sdnc/resources/config/bin/installSdncDb.sh | 38 | ||||
| -rwxr-xr-x | kubernetes/sdnc/resources/config/bin/startODL.sh | 35 | ||||
| -rw-r--r-- | kubernetes/sdnc/sdnc-prom/Chart.yaml | 2 | ||||
| -rw-r--r-- | kubernetes/sdnc/sdnc-prom/requirements.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/sdnc/templates/job.yaml | 129 | ||||
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 5 |
16 files changed, 176 insertions, 65 deletions
diff --git a/kubernetes/sdnc/Chart.yaml b/kubernetes/sdnc/Chart.yaml index 7b04c64e6e..e618e4f8b4 100644 --- a/kubernetes/sdnc/Chart.yaml +++ b/kubernetes/sdnc/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDN Controller name: sdnc -version: 4.0.0 +version: 5.0.0 diff --git a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml index aceda60ae0..f63b09e461 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml +++ b/kubernetes/sdnc/charts/dmaap-listener/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDNC DMaaP Listener name: dmaap-listener -version: 4.0.0
\ No newline at end of file +version: 5.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml index 71fbbc5ce9..79d7de4dd3 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml +++ b/kubernetes/sdnc/charts/dmaap-listener/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local' diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml index de678bf4ed..114a688ba8 100644 --- a/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml +++ b/kubernetes/sdnc/charts/sdnc-ansible-server/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDN-C Ansible Server name: sdnc-ansible-server -version: 4.0.0
\ No newline at end of file +version: 5.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml index 1d30dfd918..1063d172a6 100644 --- a/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml +++ b/kubernetes/sdnc/charts/sdnc-ansible-server/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml index 9efac5c95a..68d8b42551 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDN-C Admin Portal name: sdnc-portal -version: 4.0.0
\ No newline at end of file +version: 5.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml index 1d30dfd918..1063d172a6 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local'
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml index da6342c850..fbac3edde7 100644 --- a/kubernetes/sdnc/charts/ueb-listener/Chart.yaml +++ b/kubernetes/sdnc/charts/ueb-listener/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: SDNC UEB Listener name: ueb-listener -version: 4.0.0
\ No newline at end of file +version: 5.0.0
\ No newline at end of file diff --git a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml index 71fbbc5ce9..79d7de4dd3 100644 --- a/kubernetes/sdnc/charts/ueb-listener/requirements.yaml +++ b/kubernetes/sdnc/charts/ueb-listener/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local' diff --git a/kubernetes/sdnc/requirements.yaml b/kubernetes/sdnc/requirements.yaml index a4bffc077f..913fed12ba 100644 --- a/kubernetes/sdnc/requirements.yaml +++ b/kubernetes/sdnc/requirements.yaml @@ -14,24 +14,24 @@ dependencies: - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local' - name: cds - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: cds.enabled - name: network-name-gen - version: ~4.x-0 + version: ~5.x-0 repository: '@local' - name: dgbuilder - version: ~4.x-0 + version: ~5.x-0 repository: '@local' - name: sdnc-prom - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: config.geoEnabled - name: mariadb-galera - version: ~4.x-0 + version: ~5.x-0 repository: '@local' condition: config.localDBCluster diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh index 2a733de7d5..455cb834f9 100644 --- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh +++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh @@ -22,37 +22,49 @@ ### SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} -MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}} -MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}} +ETC_DIR=${ETC_DIR:-${SDNC_HOME}/data} +BIN_DIR=${BIN_DIR-${SDNC_HOME}/bin} +MYSQL_HOST=${MYSQL_HOST:-dbhost} +MYSQL_PASSWORD=${MYSQL_PASSWORD:-openECOMP1.0} SDNC_DB_USER=${SDNC_DB_USER:-sdnctl} -SDNC_DB_PASSWD=${SDNC_DB_PASSWD:-gamma} +SDNC_DB_PASSWORD=${SDNC_DB_PASSWORD:-gamma} SDNC_DB_DATABASE=${SDN_DB_DATABASE:-sdnctl} # Create tablespace and user account -mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql <<-END -CREATE DATABASE ${SDNC_DB_DATABASE}; -CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWD}'; -CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWD}'; +mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} mysql <<-END +CREATE DATABASE IF NOT EXISTS ${SDNC_DB_DATABASE}; +CREATE USER '${SDNC_DB_USER}'@'localhost' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; +CREATE USER '${SDNC_DB_USER}'@'%' IDENTIFIED BY '${SDNC_DB_PASSWORD}'; GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'localhost' WITH GRANT OPTION; GRANT ALL PRIVILEGES ON ${SDNC_DB_DATABASE}.* TO '${SDNC_DB_USER}'@'%' WITH GRANT OPTION; +flush privileges; commit; END # load schema -if [ -f ${SDNC_HOME}/data/sdnctl.dump ] +if [ -f ${ETC_DIR}/sdnctl.dump ] then - mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} sdnctl < ${SDNC_HOME}/data/sdnctl.dump + mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} sdnctl < ${ETC_DIR}/sdnctl.dump fi -for datafile in ${SDNC_HOME}/data/*.data.dump +for datafile in ${ETC_DIR}/*.data.dump do - mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} sdnctl < $datafile + mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWORD} sdnctl < $datafile done # Create VNIs 100-199 -${SDNC_HOME}/bin/addVnis.sh 100 199 +${BIN_DIR}/addVnis.sh 100 199 # Drop FK_NETWORK_MODEL foreign key as workaround for SDNC-291. -${SDNC_HOME}/bin/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL +${BIN_DIR}/rmForeignKey.sh NETWORK_MODEL FK_NETWORK_MODEL + +if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] +then + echo "Installing directed graphs" + ${SDNC_HOME}/svclogic/bin/install.sh +fi + + +exit 0 diff --git a/kubernetes/sdnc/resources/config/bin/startODL.sh b/kubernetes/sdnc/resources/config/bin/startODL.sh index eb49a69086..5586ebbca6 100755 --- a/kubernetes/sdnc/resources/config/bin/startODL.sh +++ b/kubernetes/sdnc/resources/config/bin/startODL.sh @@ -118,12 +118,8 @@ ODL_ADMIN_PASSWORD=${ODL_ADMIN_PASSWORD:-Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJv SDNC_HOME=${SDNC_HOME:-/opt/onap/sdnc} SDNC_BIN=${SDNC_BIN:-/opt/onap/sdnc/bin} CCSDK_HOME=${CCSDK_HOME:-/opt/onap/ccsdk} -SLEEP_TIME=${SLEEP_TIME:-120} -MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.dbRootPassword}}} -MYSQL_HOST=${MYSQL_HOST:-{{.Values.config.dbServiceName}}.{{.Release.Namespace}}} ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false} GEO_ENABLED=${GEO_ENABLED:-false} -DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim} SDNRWT=${SDNRWT:-false} SDNRWT_BOOTFEATURES=${SDNRWT_BOOTFEATURES:-sdnr-wt-feature-aggregator} export ODL_ADMIN_PASSWORD ODL_ADMIN_USERNAME @@ -133,44 +129,13 @@ echo " ENABLE_ODL_CLUSTER=$ENABLE_ODL_CLUSTER" echo " SDNC_REPLICAS=$SDNC_REPLICAS" echo " SDNRWT=$SDNRWT" -# -# Wait for database to init properly -# -echo "Waiting for mysql" -until mysql -h ${MYSQL_HOST} -u root -p${MYSQL_PASSWD} mysql &> /dev/null -do - printf "." - sleep 1 -done -echo -e "\nmysql ready" - -if [ ! -d ${DBINIT_DIR} ] -then - mkdir -p ${DBINIT_DIR} -fi -if [ ! -f ${DBINIT_DIR}/.installed ] -then - echo "Installing SDNC database" - ${SDNC_HOME}/bin/installSdncDb.sh - - if [ -x ${SDNC_HOME}/svclogic/bin/install.sh ] - then - echo "Installing directed graphs" - ${SDNC_HOME}/svclogic/bin/install.sh - fi - - echo "Installed at `date`" > ${DBINIT_DIR}/.installed -fi if [ ! -f ${SDNC_HOME}/.installed ] then echo "Installing SDN-C keyStore" ${SDNC_HOME}/bin/addSdncKeyStore.sh - # No longer needed (this was a workaround for bug in Nitrogen) - #${CCSDK_HOME}/bin/installOdlHostKey.sh - if $ENABLE_ODL_CLUSTER ; then enable_odl_cluster ; fi if $SDNRWT ; then install_sdnrwt_features ; fi diff --git a/kubernetes/sdnc/sdnc-prom/Chart.yaml b/kubernetes/sdnc/sdnc-prom/Chart.yaml index 4344db0b15..f0363e871d 100644 --- a/kubernetes/sdnc/sdnc-prom/Chart.yaml +++ b/kubernetes/sdnc/sdnc-prom/Chart.yaml @@ -15,4 +15,4 @@ apiVersion: v1 description: ONAP SDNC Policy Driven Ownership Management name: sdnc-prom -version: 4.0.0 +version: 5.0.0 diff --git a/kubernetes/sdnc/sdnc-prom/requirements.yaml b/kubernetes/sdnc/sdnc-prom/requirements.yaml index 509eaddf3d..a12911b78b 100644 --- a/kubernetes/sdnc/sdnc-prom/requirements.yaml +++ b/kubernetes/sdnc/sdnc-prom/requirements.yaml @@ -14,5 +14,5 @@ dependencies: - name: common - version: ~4.x-0 + version: ~5.x-0 repository: '@local' diff --git a/kubernetes/sdnc/templates/job.yaml b/kubernetes/sdnc/templates/job.yaml new file mode 100755 index 0000000000..9e79ebeec1 --- /dev/null +++ b/kubernetes/sdnc/templates/job.yaml @@ -0,0 +1,129 @@ +# Copyright © 2017 Amdocs, Bell Canada, AT&T +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +apiVersion: batch/v1 +kind: Job +metadata: + name: {{ include "common.fullname" . }}-dbinit-job + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} + annotations: + "helm.sh/hook": post-install + "helm.sh/hook-weight": "0" + "helm.sh/hook-delete-policy": before-hook-creation +spec: + backoffLimit: 20 + template: + metadata: + labels: + app: {{ include "common.name" . }}-job + release: {{ .Release.Name }} + name: {{ include "common.name" . }} + spec: + initContainers: + - name: {{ include "common.name" . }}-readiness + command: + - /root/ready.py + args: + - --container-name + - {{ .Values.config.mariadbGalera.chartName }} + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + containers: + - name: {{ include "common.name" . }} + image: "{{.Values.image}}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + env: + - name: MYSQL_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "common.fullname" . }} + key: db-root-password + - name: ODL_ADMIN_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "common.fullname" . }}-odl + key: odl-password + - name: SDNC_DB_PASSWORD + valueFrom: + secretKeyRef: + name: {{ template "common.fullname" . }}-sdnctl + key: db-sdnctl-password + - name: MYSQL_HOST + value: "{{.Values.config.mariadbGalera.serviceName}}.{{.Release.Namespace}}" + - name: SDNC_HOME + value: "{{.Values.config.sdncHome}}" + - name: ETC_DIR + value: "{{.Values.config.etcDir}}" + - name: BIN_DIR + value: "{{.Values.config.binDir}}" + - name: SDNC_DB_USER + value: "{{.Values.config.dbSdnctlUser}}" + - name: SDNC_DB_DATABASE + value: "{{.Values.config.dbSdnctlDatabase}}" + volumeMounts: + - mountPath: {{ .Values.config.binDir }}/installSdncDb.sh + name: bin + subPath: installSdncDb.sh + - mountPath: {{ .Values.config.configDir }}/svclogic.properties + name: properties + subPath: svclogic.properties + - mountPath: /opt/onap/sdnc/svclogic/config/svclogic.properties + name: properties + subPath: svclogic.properties + - mountPath: {{ .Values.config.configDir }}/dblib.properties + name: properties + subPath: dblib.properties + command: + - /bin/bash + args: + - {{.Values.config.binDir }}/installSdncDb.sh + resources: +{{ include "common.resources" . | indent 12 }} + {{- if .Values.nodeSelector }} + nodeSelector: +{{ toYaml .Values.nodeSelector | indent 10 }} + {{- end -}} + {{- if .Values.affinity }} + affinity: +{{ toYaml .Values.affinity | indent 10 }} + {{- end }} + volumes: + - name: localtime + hostPath: + path: /etc/localtime + - name: docker-entrypoint-initdb-d + emptyDir: {} + - name: bin + configMap: + name: {{ include "common.fullname" . }}-bin + defaultMode: 0755 + - name: properties + configMap: + name: {{ include "common.fullname" . }}-properties + defaultMode: 0644 + restartPolicy: Never + imagePullSecrets: + - name: "{{ include "common.namespace" . }}-docker-registry-key" + diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 9bd50a1c47..dcf6938f0e 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -34,6 +34,7 @@ repository: nexus3.onap.org:10001 pullPolicy: Always image: onap/sdnc-image:1.5.4 + # flag to enable debugging - application support required debugEnabled: false @@ -43,9 +44,13 @@ config: odlGid: 101 odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U dbRootPassword: secretpassword + dbSdnctlUser: sdnctl + dbSdnctlDatabase: sdnctl dbSdnctlPassword: gamma enableClustering: true + sdncHome: /opt/onap/sdnc binDir: /opt/onap/sdnc/bin + etcDir: /opt/onap/sdnc/data 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 |