diff options
Diffstat (limited to 'kubernetes/sdnc')
12 files changed, 21 insertions, 23 deletions
diff --git a/kubernetes/sdnc/components/dmaap-listener/values.yaml b/kubernetes/sdnc/components/dmaap-listener/values.yaml index 0d180ec029..95aba913a3 100644 --- a/kubernetes/sdnc/components/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/components/dmaap-listener/values.yaml @@ -49,7 +49,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/sdnc-dmaap-listener-image:2.1.6 +image: onap/sdnc-dmaap-listener-image:2.2.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml index 1f0dbdeced..51263cf410 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/templates/deployment.yaml @@ -67,7 +67,7 @@ spec: containers: - name: {{ include "common.name" . }} command: ["/bin/bash"] - args: ["-c", "cd /opt/onap/ccsdk && ./startAnsibleServer.sh"] + args: ["-c", "cd /opt/ansible-server && ./startAnsibleServer.sh"] image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }} imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} diff --git a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml index 13c53d3fe1..7294dbccc7 100644 --- a/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/components/sdnc-ansible-server/values.yaml @@ -49,7 +49,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/sdnc-ansible-server-image:2.1.6 +image: onap/sdnc-ansible-server-image:2.2.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh b/kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh index fa76a9ee40..6d7ada618d 100755 --- a/kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh +++ b/kubernetes/sdnc/components/sdnc-prom/resources/bin/prom.sh @@ -1,6 +1,6 @@ -#!/bin/bash -{{/* +#!/bin/sh +{{/* # Copyright © 2018 Amdocs # # Licensed under the Apache License, Version 2.0 (the "License"); diff --git a/kubernetes/sdnc/components/sdnc-web/values.yaml b/kubernetes/sdnc/components/sdnc-web/values.yaml index 3d9f86192f..803488b054 100644 --- a/kubernetes/sdnc/components/sdnc-web/values.yaml +++ b/kubernetes/sdnc/components/sdnc-web/values.yaml @@ -23,7 +23,7 @@ global: # Application configuration defaults. ################################################################# # application image -image: "onap/sdnc-web-image:2.1.6" +image: "onap/sdnc-web-image:2.2.0" pullPolicy: Always config: diff --git a/kubernetes/sdnc/components/ueb-listener/values.yaml b/kubernetes/sdnc/components/ueb-listener/values.yaml index c35095c158..b58154fd1a 100644 --- a/kubernetes/sdnc/components/ueb-listener/values.yaml +++ b/kubernetes/sdnc/components/ueb-listener/values.yaml @@ -55,7 +55,7 @@ secrets: # Application configuration defaults. ################################################################# # application image -image: onap/sdnc-ueb-listener-image:2.1.6 +image: onap/sdnc-ueb-listener-image:2.2.0 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/sdnc/resources/config/bin/createLinks.sh b/kubernetes/sdnc/resources/config/bin/createLinks.sh index 52c40723f9..d8a2025bea 100755 --- a/kubernetes/sdnc/resources/config/bin/createLinks.sh +++ b/kubernetes/sdnc/resources/config/bin/createLinks.sh @@ -4,8 +4,7 @@ # ============LICENSE_START======================================================= # ONAP : SDN-C # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -42,7 +41,7 @@ then if [ -d $JOURNAL_PATH ] then mv $JOURNAL_PATH/* $MDSAL_PATH/journal - rm -f $JOURNAL_PATH + rm -f $JOURNAL_PATH fi ln -s $MDSAL_PATH/journal $JOURNAL_PATH fi @@ -52,7 +51,7 @@ then if [ -d $SNAPSHOTS_PATH ] then mv $SNAPSHOTS_PATH/* $MDSAL_PATH/snapshots - rm -f $SNAPSHOTS_PATH + rm -f $SNAPSHOTS_PATH fi ln -s $MDSAL_PATH/snapshots $SNAPSHOTS_PATH fi diff --git a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh index 42abf54444..2406a48c37 100755 --- a/kubernetes/sdnc/resources/config/bin/installSdncDb.sh +++ b/kubernetes/sdnc/resources/config/bin/installSdncDb.sh @@ -1,12 +1,11 @@ -#!/bin/bash -{{/* +#!/bin/sh +{{/* ### # ============LICENSE_START======================================================= # ONAP : SDN-C # ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights -# reserved. +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. # ================================================================================ # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg b/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg index 29dd0e54dd..95df4b84ad 100644 --- a/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg +++ b/kubernetes/sdnc/resources/config/conf/org.opendaylight.controller.cluster.datastore.cfg @@ -96,7 +96,7 @@ operational.persistent=false #sync-index-threshold=10 # Record new transaction allocation stack trace, useful for debugging. This makes the log include -# the stack trace of the creator of the Tx when there is an exception when the transaction is submitted +# the stack trace of the creator of the Tx when there is an exception when the transaction is submitted # (e.g. for a failed validation). Defaults to false due to performance impact. #transaction-debug-context-enabled=true persistent-actor-restart-min-backoff-in-seconds={{.Values.config.odl.datastore.persistentActorRestartMinBackoffInSeconds}} diff --git a/kubernetes/sdnc/resources/config/conf/setenv b/kubernetes/sdnc/resources/config/conf/setenv index 85af48ac1d..303c3168d7 100644 --- a/kubernetes/sdnc/resources/config/conf/setenv +++ b/kubernetes/sdnc/resources/config/conf/setenv @@ -33,7 +33,7 @@ # # -# The following section shows the possible configuration options for the default +# The following section shows the possible configuration options for the default # karaf scripts # # export JAVA_HOME # Location of Java installation diff --git a/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster b/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster index ffd044854f..8b489e0ee4 100755 --- a/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster +++ b/kubernetes/sdnc/resources/geo/bin/sdnc.isPrimaryCluster @@ -26,10 +26,10 @@ fi case $IS_PRIMARY_CLUSTER in true|false) - echo $IS_PRIMARY_CLUSTER - ;; + echo $IS_PRIMARY_CLUSTER + ;; *) - echo "NOT CLUSTERED" - exit 1 - ;; + echo "NOT CLUSTERED" + exit 1 + ;; esac diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 1c9a422bab..785435a478 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -206,7 +206,7 @@ certificates: # application images pullPolicy: Always -image: onap/sdnc-image:2.1.6 +image: onap/sdnc-image:2.2.0 # flag to enable debugging - application support required debugEnabled: false |