From: Alexis de Talhouët Date: Wed, 21 Nov 2018 13:40:33 +0000 (+0000) Subject: Merge "SO: Add camundaURL for sdc-controller" X-Git-Tag: 3.0.0-ONAP~19 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=9cb39409675ea76b9e8ee017b54f8dc171209fec;hp=b716b762a92c844370f271ebd1cc223a318bcd53;p=oom.git Merge "SO: Add camundaURL for sdc-controller" --- diff --git a/INFO.yaml b/INFO.yaml index da3cd81e8b..d840cc647e 100644 --- a/INFO.yaml +++ b/INFO.yaml @@ -33,55 +33,25 @@ committers: 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' diff --git a/kubernetes/appc/charts/appc-cdt/values.yaml b/kubernetes/appc/charts/appc-cdt/values.yaml index dfebe57d21..517b69ddea 100644 --- a/kubernetes/appc/charts/appc-cdt/values.yaml +++ b/kubernetes/appc/charts/appc-cdt/values.yaml @@ -26,7 +26,7 @@ flavor: small # 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 diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml index 9c5a50110a..17f819b8ea 100644 --- a/kubernetes/appc/values.yaml +++ b/kubernetes/appc/values.yaml @@ -31,7 +31,7 @@ global: flavor: small # application image repository: nexus3.onap.org:10001 -image: onap/appc-image:1.4.2-SNAPSHOT-latest +image: onap/appc-image:1.4.3 pullPolicy: Always # flag to enable debugging - application support required diff --git a/kubernetes/common/controller-blueprints/values.yaml b/kubernetes/common/controller-blueprints/values.yaml index f8b8aba9f4..bcca317dee 100644 --- a/kubernetes/common/controller-blueprints/values.yaml +++ b/kubernetes/common/controller-blueprints/values.yaml @@ -38,7 +38,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/common/dgbuilder/values.yaml b/kubernetes/common/dgbuilder/values.yaml index 7f14d90b95..cb45d29762 100644 --- a/kubernetes/common/dgbuilder/values.yaml +++ b/kubernetes/common/dgbuilder/values.yaml @@ -47,7 +47,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/common/network-name-gen/values.yaml b/kubernetes/common/network-name-gen/values.yaml index 7e9ef34200..5ba48a21d3 100644 --- a/kubernetes/common/network-name-gen/values.yaml +++ b/kubernetes/common/network-name-gen/values.yaml @@ -54,7 +54,7 @@ mariadb-galera: ################################################################# # 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 diff --git a/kubernetes/onap/resources/environments/minimal-onap.yaml b/kubernetes/onap/resources/environments/minimal-onap.yaml new file mode 100644 index 0000000000..e5cb97193f --- /dev/null +++ b/kubernetes/onap/resources/environments/minimal-onap.yaml @@ -0,0 +1,175 @@ +# 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 diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py index dd15e31fcb..4bcd3d93d5 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_preload_parameters.py @@ -18,7 +18,7 @@ GLOBAL_PRELOAD_PARAMETERS = { '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 }}", diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 9daddfd00a..6ac23c09ee 100755 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -40,7 +40,9 @@ config: # 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 @@ -66,7 +68,7 @@ ubuntu14Image: "Ubuntu_14_trusty" # 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 diff --git a/kubernetes/sdc/charts/sdc-be/values.yaml b/kubernetes/sdc/charts/sdc-be/values.yaml index 4eb5ffdc2c..643828ee88 100644 --- a/kubernetes/sdc/charts/sdc-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-be/values.yaml @@ -28,8 +28,8 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-cs/values.yaml b/kubernetes/sdc/charts/sdc-cs/values.yaml index 39d99513ef..4f51bbc4a5 100644 --- a/kubernetes/sdc/charts/sdc-cs/values.yaml +++ b/kubernetes/sdc/charts/sdc-cs/values.yaml @@ -28,8 +28,8 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-dcae-be/values.yaml b/kubernetes/sdc/charts/sdc-dcae-be/values.yaml index 9ae8f31499..15f924a511 100644 --- a/kubernetes/sdc/charts/sdc-dcae-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-dcae-be/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml b/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml index f04b8fa5f2..cf0640565c 100644 --- a/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml +++ b/kubernetes/sdc/charts/sdc-dcae-dt/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml b/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml index 9f544cb9e0..ab6eaf3fbf 100644 --- a/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml +++ b/kubernetes/sdc/charts/sdc-dcae-fe/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml index a22479e8e8..f968c59dae 100644 --- a/kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml +++ b/kubernetes/sdc/charts/sdc-dcae-tosca-lab/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-es/values.yaml b/kubernetes/sdc/charts/sdc-es/values.yaml index 42a90a84b8..b44a431881 100644 --- a/kubernetes/sdc/charts/sdc-es/values.yaml +++ b/kubernetes/sdc/charts/sdc-es/values.yaml @@ -31,8 +31,8 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-fe/values.yaml b/kubernetes/sdc/charts/sdc-fe/values.yaml index 981e6354cc..14c40d5932 100644 --- a/kubernetes/sdc/charts/sdc-fe/values.yaml +++ b/kubernetes/sdc/charts/sdc-fe/values.yaml @@ -28,7 +28,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/sdc-frontend:1.3.2 +image: onap/sdc-frontend:1.3.3 pullPolicy: Always config: diff --git a/kubernetes/sdc/charts/sdc-kb/values.yaml b/kubernetes/sdc/charts/sdc-kb/values.yaml index 5aca02160a..9ba515172a 100644 --- a/kubernetes/sdc/charts/sdc-kb/values.yaml +++ b/kubernetes/sdc/charts/sdc-kb/values.yaml @@ -28,7 +28,7 @@ global: ################################################################# # application image repository: nexus3.onap.org:10001 -image: onap/sdc-kibana:1.3.2 +image: onap/sdc-kibana:1.3.3 pullPolicy: Always config: diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml index e54a00e994..231b812190 100644 --- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml @@ -28,8 +28,8 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml index deb5c331ee..cb55f4a3a5 100644 --- a/kubernetes/sdc/charts/sdc-wfd-be/values.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-be/values.yaml @@ -28,8 +28,8 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml index f7a869ef91..5d942e16f7 100644 --- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml +++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdnc/charts/dmaap-listener/values.yaml b/kubernetes/sdnc/charts/dmaap-listener/values.yaml index 8ba2521b54..69807f27be 100644 --- a/kubernetes/sdnc/charts/dmaap-listener/values.yaml +++ b/kubernetes/sdnc/charts/dmaap-listener/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml index a6ca80eea1..08713d30ae 100644 --- a/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml +++ b/kubernetes/sdnc/charts/sdnc-ansible-server/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdnc/charts/sdnc-portal/values.yaml b/kubernetes/sdnc/charts/sdnc-portal/values.yaml index 2c46307f05..be97ade48b 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/values.yaml +++ b/kubernetes/sdnc/charts/sdnc-portal/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml index d3b4833125..9d52a7df09 100644 --- a/kubernetes/sdnc/charts/ueb-listener/values.yaml +++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml @@ -27,7 +27,7 @@ global: ################################################################# # 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 diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml index 437de3dedb..0414a82d12 100644 --- a/kubernetes/sdnc/values.yaml +++ b/kubernetes/sdnc/values.yaml @@ -32,7 +32,7 @@ global: # 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 diff --git a/kubernetes/vid/values.yaml b/kubernetes/vid/values.yaml index 1527f39919..3c8645feee 100644 --- a/kubernetes/vid/values.yaml +++ b/kubernetes/vid/values.yaml @@ -27,7 +27,7 @@ subChartsOnly: # 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