summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarco Platania <platania@research.att.com>2018-04-25 17:56:20 +0000
committerGerrit Code Review <gerrit@onap.org>2018-04-25 17:56:20 +0000
commitb2773cd4ffc19c1fc982eed43c87bad8a3dd525e (patch)
treeef2955821aba289eb3a8616b561cd7e9f3e92be6
parenta0c1136e6e78fcb3ca20997fa93f23ffe64d9302 (diff)
parent34f65d52effdf97819ee3201920d0b6b53d87c2f (diff)
Merge "Add default integration-override.yaml"
-rw-r--r--deployment/heat/onap-oom/env/default/integration-override.yaml139
-rw-r--r--deployment/heat/onap-oom/k8s_vm_entrypoint.sh8
2 files changed, 146 insertions, 1 deletions
diff --git a/deployment/heat/onap-oom/env/default/integration-override.yaml b/deployment/heat/onap-oom/env/default/integration-override.yaml
new file mode 100644
index 000000000..f9f91e7aa
--- /dev/null
+++ b/deployment/heat/onap-oom/env/default/integration-override.yaml
@@ -0,0 +1,139 @@
+# Copyright © 2017 Amdocs, Bell Canada
+#
+# 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 useful to test one or more subcharts.
+# It overrides the default ONAP parent chart behaviour to deploy
+# all of ONAP.
+#
+# Example use to enable a single subchart (from this directory):
+#
+# helm install local/onap -n onap --namespace onap -f disable-allcharts.yaml --set so.enabled=true
+
+
+#################################################################
+# Global configuration overrides.
+#
+# These overrides will affect all helm charts (ie. applications)
+# that are listed below and are 'enabled'.
+#################################################################
+global:
+ # Change to an unused port prefix range to prevent port conflicts
+ # with other instances running within the same k8s cluster
+ nodePortPrefix: 302
+
+ # local nexus proxy - nexus3 default
+ repository: nexus3.onap.org:10001
+ # image pull policy
+ #pullPolicy: Always
+ pullPolicy: IfNotPresent
+
+
+ # default mount path root directory referenced
+ # by persistent volumes and log files
+# persistence:
+# mountPath: /onapdata
+
+#################################################################
+# Enable/disable and configure helm charts (ie. applications)
+# to customize the ONAP deployment.
+#################################################################
+aaf:
+ enabled: true
+aai:
+ enabled: true
+ # aai subchart image overrides
+ aai-champ:
+ image: onap/champ:1.2-STAGING-latest
+ aai-data-router:
+ image: onap/data-router:1.2-STAGING-latest
+ aai-modelloader:
+ image: onap/model-loader:1.2-STAGING-latest
+ aai-resources:
+ image: onap/aai-resources:1.2-STAGING-latest
+ aai-search-data:
+ image: onap/search-data-service:1.2-STAGING-latest
+ aai-sparky-be:
+ image: onap/sparky-be:1.2-STAGING-latest
+ aai-traveral:
+ image: onap/aai-traversal:1.2-STAGING-latest
+appc:
+ enabled: false
+clamp:
+ enabled: true
+cli:
+ enabled: true
+consul:
+ enabled: true
+dcaegen2:
+ enabled: false
+esr:
+ enabled: true
+ # esr parent chart (server) image override
+ image: onap/aai/esr-server:1.1.0-SNAPSHOT
+ # esr subchart omage override
+ esr-gui:
+ image: onap/aai/esr-gui:1.1.0-SNAPSHOT
+log:
+ enabled: true
+message-router:
+ enabled: true
+# kafka:
+# repositoryOverride: docker.io
+# image: wurstmeister/kafka:latest
+mock:
+ enabled: true
+msb:
+ enabled: true
+multicloud:
+ enabled: true
+policy:
+ enabled: true
+portal:
+ enabled: true
+robot:
+ enabled: true
+ #pullPolicy: Always
+# config:
+ # openstack configuration
+ openStackUserName: "demo"
+ openStackRegion: "RegionOne"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackServiceTenantName: "service"
+ #openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
+ openStackPassword: "onapdemo"
+ openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4"
+ openStackTenantId: "d570c718cbc545029f40e50b75eb13df"
+sdc:
+ enabled: true
+sdnc:
+ enabled: true
+so:
+ enabled: true
+ # so server configuration
+ config:
+ # openstack configuration
+ openStackUserName: "demo"
+ openStackRegion: "RegionOne"
+ openStackKeyStoneUrl: "http://10.12.25.2:5000"
+ openStackServiceTenantName: "service"
+ openStackEncryptedPasswordHere: "bbaef6cd76625ab9eb60deedeae7dbb9"
+
+uui:
+ enabled: true
+vfc:
+ enabled: true
+vid:
+ enabled: true
+vnfsdk:
+ enabled: true
diff --git a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
index f4c6eb6a5..7e8ca46fe 100644
--- a/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/k8s_vm_entrypoint.sh
@@ -145,6 +145,7 @@ git log -1
cd ~
ln -s ~/integration/deployment/heat/onap-oom/env/__lab_name__/integration-override.yaml
+sed -i 's/nexus3.onap.org:10001/__docker_proxy__/g' integration-override.yaml
# version control the persistence volume to see what's happening
@@ -168,7 +169,12 @@ helm repo add local http://127.0.0.1:8879
helm repo list
make all
helm search -l | grep local
-helm install local/onap -n dev --namespace onap -f ~/integration/deployment/heat/onap-oom/env/__lab_name__/integration-override.yaml
+if [ -e ~/integration-override.yaml ]; then
+ helm install local/onap -n dev --namespace onap -f ~/integration-override.yaml
+else
+ helm install local/onap -n dev --namespace onap
+fi
+
# Check ONAP status:
sleep 3