company: 'Amdocs'
id: 'BorislavG'
timezone: 'Israel/Raanana'
- - name: 'Christophe Closset'
- email: 'cc697w@intl.att.com'
- company: 'ATT'
- id: 'ChrisC'
- timezone: 'Belgium/Namur'
- - name: 'Earle West'
- email: 'ehwest@gmail.com'
- company: ''
- id: 'ehwest'
- timezone: 'Belgium/Namur'
+ - name: 'James MacNider'
+ email: 'James.MacNider@amdocs.com'
+ company: 'Amdocs'
+ id: 'James.MacNider'
+ timezone: 'Canada/Ontario'
- name: 'Hong Guan'
email: 'hg4105@att.com'
company: 'ATT'
id: 'hg4105'
timezone: ''
- - name: 'Rui Hu'
- email: 'hu.rui2@zte.com.cn'
- company: 'ZTE'
- id: 'hu.rui'
- timezone: ''
- - name: 'Jerome Doucerain'
- email: 'jerome.doucerain@bell.ca'
- company: 'Bell'
- id: 'jdoucerain'
- timezone: 'Canada/Montreal'
- name: 'Jun (Nicolas) Hu'
email: 'jh245g@att.com'
company: 'ATT'
id: 'jh245g'
timezone: 'America/New York'
- - name: 'David Sauvageau'
- email: 'david.sauvageau@bell.ca'
- company: 'Bell'
- id: 'david.sauvageau'
- timezone: 'Canada/Montreal'
- - name: 'Mandeep Khinda'
- email: 'Mandeep.Khinda@amdocs.com'
- company: 'Amdocs'
- id: 'mkhinda'
- timezone: 'Canada/Ontario'
- name: 'Xue Gao'
email: 'xg353y@intl.att.com'
company: 'ATT'
id: 'xuegao'
timezone: 'Belgium/Namur'
- - name: 'Yury Novitsky'
- email: 'Yury.Novitsky@Amdocs.com'
- company: 'Amdocs'
- id: 'yuryn'
- timezone: 'Israel/Raanana'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-ansible-server-image:1.4.1
+image: onap/ccsdk-ansible-server-image:0.3.2
pullPolicy: Always
# flag to enable debugging - application support required
# application image
repository: nexus3.onap.org:10001
-image: onap/appc-cdt-image:1.4.0
+image: onap/appc-cdt-image:1.4.3
pullPolicy: Always
# application configuration
MYSQL_PASSWD=${MYSQL_PASSWD:-{{.Values.config.mariadbRootPassword}}}
ENABLE_ODL_CLUSTER=${ENABLE_ODL_CLUSTER:-false}
ENABLE_AAF=${ENABLE_AAF:-true}
+DBINIT_DIR=${DBINIT_DIR:-/opt/opendaylight/current/daexim}
appcInstallStartTime=$(date +%s)
-#
-# Adding the DMAAP_TOPIC_ENV variable into APPC-ASDC-LISTENER properties
-#
-DMAAP_TOPIC_ENV=${DMAAP_TOPIC_ENV}
-
-if [ -z "$DMAAP_TOPIC_ENV" ]
- then
- echo "DMAAP_TOPIC_ENV shell variable is empty. Adding default value OS-ETE-DFW"
- DMAAP_TOPIC_ENV="OS-ETE-DFW"
- else
- echo "DMAAP_TOPIC_ENV shell variable exists and it's $DMAAP_TOPIC_ENV"
-fi
-
-echo "Adding a value to property appc.asdc.env in appc.properties for appc-asdc-listener feature"
-echo "" >> $APPC_HOME/data/properties/appc.properties
-echo "appc.asdc.env=$DMAAP_TOPIC_ENV" >> $APPC_HOME/data/properties/appc.properties
-echo "" >> $APPC_HOME/data/properties/appc.properties
-
#
# Wait for database to init properly
#
done
echo -e "\nmariadbgalera ready"
-if [ ! -f ${SDNC_HOME}/.installed ]
+if [ ! -d ${DBINIT_DIR} ]
then
- echo "Installing SDNC database"
- ${SDNC_HOME}/bin/installSdncDb.sh
+ mkdir -p ${DBINIT_DIR}
+fi
- echo "Installing APPC database"
- ${APPC_HOME}/bin/installAppcDb.sh
+if [ ! -f ${DBINIT_DIR}/.installed ]
+then
+ sdnc_db_exists=$(mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p{{.Values.config.mariadbRootPassword}} mysql <<-END
+show databases like 'sdnctl';
+END
+)
+ if [ "x${sdnc_db_exists}" == "x" ]
+ then
+ echo "Installing SDNC database"
+ ${SDNC_HOME}/bin/installSdncDb.sh
+ fi
+
+ appc_db_exists=$(mysql -h {{.Values.config.mariadbGaleraSVCName}}.{{.Release.Namespace}} -u root -p{{.Values.config.mariadbRootPassword}} mysql <<-END
+show databases like 'appcctl';
+END
+)
+ if [ "x${appc_db_exists}" == "x" ]
+ then
+ echo "Installing APPC database"
+ ${APPC_HOME}/bin/installAppcDb.sh
+ fi
+ echo "Installed at `date`" > ${DBINIT_DIR}/.installed
+fi
+
+
+if [ ! -f ${SDNC_HOME}/.installed ]
+then
echo "Installing ODL Host Key"
${SDNC_HOME}/bin/installOdlHostKey.sh
appc.OAM.client.name=testOAM
appc.OAM.provider.user={{.Values.config.odlUser}}
appc.OAM.provider.pass={{.Values.config.odlPassword}}
+
+appc.asdc.env={{.Values.config.dmaapTopicEnv}}
flavor: small
# application image
repository: nexus3.onap.org:10001
-image: onap/appc-image:1.4.0
+image: onap/appc-image:1.4.3
pullPolicy: Always
# flag to enable debugging - application support required
enableClustering: false
configDir: /opt/onap/appc/data/properties
dmaapTopic: SUCCESS
+ dmaapTopicEnv: AUTO
logstashServiceName: log-ls
logstashPort: 5044
odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/ccsdk-controllerblueprints:latest
+image: onap/ccsdk-controllerblueprints:0.3.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/ccsdk-dgbuilder-image:0.3.1
+image: onap/ccsdk-dgbuilder-image:0.3.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/ccsdk-apps-ms-neng:0.3.1
+image: onap/ccsdk-apps-ms-neng:0.3.2
pullPolicy: IfNotPresent
# application configuration
--- /dev/null
+# Copyright © 2017 Amdocs, Bell Canada, Orange
+#
+# 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.
+
+
+# This override file is used to deploy a minmal configuration to
+# to onboard and deploy a VNF.
+# It includes the following components:
+# A&AI, DMAAP, Portal, Robot, SDC, SDNC, SO, VID
+#
+# Minimal resources are also reviewed for the various containers
+# A&AI: no override => to be fixed
+# DMAAP: no override
+# Portal: new values
+# Robot: new values
+# SO: no override
+# SDC: new values
+# SDNC: no override
+# VID: no override
+#
+# Replica are set to 1 (A&AI Cassandra)
+#
+# In addition, some parameters are set to limit the memory footprint
+#
+# It overrides the default ONAP parent chart behaviour to deploy
+# all of ONAP.
+#
+# helm deploy minimal local/onap --namespace onap -f minimal-onap.yaml
+
+#################################################################
+# Minimal ONAP deployment to onboard and deploy a VNF
+#################################################################
+aai:
+ enabled: true
+ global:
+ cassandra:
+ replicas: 1
+ aai-cassandra:
+ replicaCount: 1
+aaf:
+ enabled: false
+appc:
+ enabled: false
+clamp:
+ enabled: false
+cli:
+ enabled: false
+consul:
+ enabled: false
+contrib:
+ enabled: false
+dcaegen2:
+ enabled: false
+dmaap:
+ enabled: true
+esr:
+ enabled: false
+log:
+ enabled: false
+msb:
+ enabled: false
+multicloud:
+ enabled: false
+nbi:
+ enabled: false
+oof:
+ enabled: false
+policy:
+ enabled: false
+pomba:
+ enabled: false
+portal:
+ enabled: true
+ portal-cassandra:
+ config:
+ cassandraJvmOpts: "-Xmx512m -Xms256m"
+ resources:
+ small:
+ limits:
+ cpu: 1
+ memory: 2Gi
+ requests:
+ cpu: 100m
+ memory: 1Gi
+ portal-app:
+ resources:
+ small:
+ limits:
+ cpu: 1
+ memory: 2Gi
+ requests:
+ cpu: 100m
+ memory: 1Gi
+ resources:
+ portal-mariaddb:
+ resources:
+ small:
+ limits:
+ cpu: 800m
+ memory: 1Gi
+ requests:
+ cpu: 100m
+ memory: 500Mi
+ portal-widget:
+ resources:
+ small:
+ limits:
+ cpu: 1
+ memory: 2Gi
+ requests:
+ cpu: 100m
+ memory: 500Mi
+robot:
+ enabled: true
+ config:
+ openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
+ resources:
+ small:
+ limits:
+ cpu: 1
+ memory: 2Gi
+ requests:
+ cpu: 10m
+ memory: 100Mi
+sdc:
+ enabled: true
+ sdc-be:
+ config:
+ javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=4000,server=y,suspend=n -Xmx512m -Xms256m"
+ sdc-fe:
+ resources:
+ small:
+ limits:
+ cpu: 1
+ memory: 2Gi
+ requests:
+ cpu: 10m
+ memory: 500Mi
+ sdc-cs:
+ config:
+ maxHeapSize: "512M"
+ heapNewSize: "256M"
+sdnc:
+ enabled: true
+sniro-emulator:
+ enabled: false
+so:
+ enabled: true
+ config:
+ # openstack configuration
+ openStackUserName: "$OPENSTACK_USER_NAME"
+ openStackRegion: "$OPENSTACK_REGION"
+ openStackKeyStoneUrl: "$OPENSTACK_KEYSTONE_URL"
+ openStackServiceTenantName: "$OPENSTACK_TENANT_NAME"
+ openStackEncryptedPasswordHere: "$OPENSTACK_ENCRYPTED_PASSWORD"
+uui:
+ enabled: false
+vid:
+ enabled: true
+vfc:
+ enabled: false
+vnfsdk:
+ enabled: false
+vvp:
+ enabled: false
'key_name' : 'vfw_key${uuid}',
"pub_key" : "{{ .Values.vnfPubKey }}",
"repo_url_blob" : "https://nexus.onap.org/content/repositories/raw",
- "repo_url_artifacts" : "https://nexus.onap.org/content/groups/staging",
+ "repo_url_artifacts" : "{{ .Values.demoArtifactsRepoUrl }}",
"demo_artifacts_version" : "${GLOBAL_INJECTED_ARTIFACTS_VERSION}",
"onap_private_net_id" : "${GLOBAL_INJECTED_NETWORK}",
"onap_private_subnet_id" : "{{ .Values.openStackPrivateSubnetId }}",
# Demo configuration
# Nexus demo artifact version. Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION
-demoArtifactsVersion: "1.2.0-SNAPSHOT"
+demoArtifactsVersion: "1.3.0"
+# Nexus demo artifact URL.
+demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
# Openstack medium sized flavour name. Maps GLOBAL_INJECTED_VM_FLAVOR
openStackFlavourMedium: "m1.medium"
# Openstack keystone URL. Maps to GLOBAL_INJECTED_KEYSTONE
# Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE
ubuntu16Image: "Ubuntu_16_xenial"
# GLOBAL_INJECTED_SCRIPT_VERSION. Maps to GLOBAL_INJECTED_SCRIPT_VERSION
-scriptVersion: "1.2.0-SNAPSHOT"
+scriptVersion: "1.3.0"
# Openstack network to which VNFs will bind their primary (first) interface. Maps to GLOBAL_INJECTED_NETWORK
openStackPrivateNetId: "e8f51956-00dd-4425-af36-045716781ffc"
# Openstack security group for instantiating VNFs
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-backend:1.3.2
-backendInitImage: onap/sdc-backend-init:1.3.2
+image: onap/sdc-backend:1.3.3
+backendInitImage: onap/sdc-backend-init:1.3.3
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-cassandra:1.3.2
-cassandraInitImage: onap/sdc-cassandra-init:1.3.2
+image: onap/sdc-cassandra:1.3.3
+cassandraInitImage: onap/sdc-cassandra-init:1.3.3
pullPolicy: Always
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-be:1.3-STAGING-latest
+image: onap/dcae-be:1.3.0
pullPolicy: Always
backendInitImage: onap/dcae-tools:1.3-STAGING-latest
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-dt:1.2-STAGING-latest
+image: onap/dcae-dt:1.2.0
pullPolicy: IfNotPresent
config:
javaOptions: -XX:MaxPermSize=256m -Xmx1024m -Dconfig.home=config -Dlog.home=/var/lib/jetty/logs/ -Dlogging.config=config/dcae-dt/logback-spring.xml
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-fe:1.3-STAGING-latest
+image: onap/dcae-fe:1.3.0
pullPolicy: Always
config:
javaOptions: -XX:MaxPermSize=256m -Xmx1024m -Dconfig.home=config -Dlog.home=/var/lib/jetty/logs/ -Dlogging.config=config/dcae-fe/logback-spring.xml
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/dcae-tosca-app:1.3-STAGING-latest
+image: onap/dcae-tosca-app:1.3.0
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-elasticsearch:1.3.2
-elasticInitImage: onap/sdc-init-elasticsearch:1.3.2
+image: onap/sdc-elasticsearch:1.3.3
+elasticInitImage: onap/sdc-init-elasticsearch:1.3.3
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-frontend:1.3.2
+image: onap/sdc-frontend:1.3.3
pullPolicy: Always
config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-kibana:1.3.2
+image: onap/sdc-kibana:1.3.3
pullPolicy: Always
config:
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdc-onboard-backend:1.3.2
-onboardingInitImage: onap/sdc-onboard-cassandra-init:1.3.2
+image: onap/sdc-onboard-backend:1.3.3
+onboardingInitImage: onap/sdc-onboard-cassandra-init:1.3.3
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/workflow-backend:1.3.1
-configInitImage: onap/workflow-init:1.3.1
+image: onap/workflow-backend:1.3.2
+configInitImage: onap/workflow-init:1.3.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/workflow-frontend:1.3.1
+image: onap/workflow-frontend:1.3.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-dmaap-listener-image:1.4.1
+image: onap/sdnc-dmaap-listener-image:1.4.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-ansible-server-image:1.4.1
+image: onap/sdnc-ansible-server-image:1.4.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/admportal-sdnc-image:1.4.1
+image: onap/admportal-sdnc-image:1.4.2
pullPolicy: Always
# flag to enable debugging - application support required
#################################################################
# application image
repository: nexus3.onap.org:10001
-image: onap/sdnc-ueb-listener-image:1.4.1
+image: onap/sdnc-ueb-listener-image:1.4.2
pullPolicy: Always
# flag to enable debugging - application support required
# application images
repository: nexus3.onap.org:10001
pullPolicy: Always
-image: onap/sdnc-image:1.4.1
+image: onap/sdnc-image:1.4.2
# flag to enable debugging - application support required
debugEnabled: false
db:
auth: Basic YnBlbDpwYXNzd29yZDEk
site-name: onapheat
+ camundaURL: http://so-bpmn-infra.{{ include "common.namespace" . }}:8081/
adapters:
requestDb:
endpoint: http://so-request-db-adapter.{{ include "common.namespace" . }}:8083
# application image
repository: nexus3.onap.org:10001
-image: onap/vid:3.2.0
+image: onap/vid:3.2.2
pullPolicy: Always
# mariadb image for initializing
Code Review / oom.git / commitdiff