aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Elliott <mike.elliott@amdocs.com>2018-03-23 13:55:38 -0400
committerMike Elliott <mike.elliott@amdocs.com>2018-03-23 14:07:45 -0400
commit37764a610ae66b53ed6b40c9eb11f54187e5dde0 (patch)
tree8aba00773845c765e7de29da09d27262f474b802
parentd2b495234d54612e1cddcd709ffcf3620275fddf (diff)
Enable all helm charts by default in parent chart
This is as a means towards obsoleting the oneclick scripts from the Beijing release, in favour of directly using Helm. From this point on, users of onap should use the follow command: helm install local/onap -n onap --namespace onap Please refer to the official documentation for all the steps required to deploy onap. Currently as a patched to be merged: https://gerrit.onap.org/r/#/c/37871/ Change-Id: I75e5dbc9a79fec86a9b7c0cff487b10ec9df9a20 Issue-ID: OOM-816 Signed-off-by: Mike Elliott <mike.elliott@amdocs.com>
-rw-r--r--kubernetes/esr/Chart.yaml2
-rw-r--r--kubernetes/onap/requirements.yaml4
-rw-r--r--kubernetes/onap/resources/environments/dev.yaml (renamed from kubernetes/onap/resources/environments/onap-demo.yaml)55
-rw-r--r--kubernetes/onap/values.yaml42
4 files changed, 73 insertions, 30 deletions
diff --git a/kubernetes/esr/Chart.yaml b/kubernetes/esr/Chart.yaml
index 1de7295023..a80e6995b3 100644
--- a/kubernetes/esr/Chart.yaml
+++ b/kubernetes/esr/Chart.yaml
@@ -15,4 +15,4 @@
apiVersion: v1
description: A Helm chart for Kubernetes
name: esr
-version: v1.0.0
+version: 1.0.0
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 7b5e56b070..32f24703f8 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -30,7 +30,7 @@ dependencies:
repository: '@local'
condition: appc.enabled
- name: clamp
- version: ~1.1.0
+ version: ~2.0.0
repository: '@local'
condition: clamp.enabled
- name: cli
@@ -49,7 +49,7 @@ dependencies:
repository: '@local'
condition: dcaegen2.enabled
- name: esr
- version: ~1.1.0
+ version: ~1.0.0
repository: '@local'
condition: esr.enabled
- name: log
diff --git a/kubernetes/onap/resources/environments/onap-demo.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 2748c3179e..8bbaa279e8 100644
--- a/kubernetes/onap/resources/environments/onap-demo.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -37,7 +37,7 @@ global:
# override default mount path root directory
# referenced by persistent volumes and log files
persistence:
- mountPath: /dockerdata-nfs
+ mountPath: /dockerdata
# flag to enable debugging - application support required
debugEnabled: true
@@ -46,17 +46,52 @@ global:
# Enable/disable and configure helm charts (ie. applications)
# to customize the ONAP deployment.
#################################################################
-consul:
+aaf:
+ enabled: false
+aai:
+ enabled: false
+appc:
+ enabled: false
+clamp:
enabled: true
-
-so:
+cli:
+ enabled: false
+consul: # Consul Health Check Monitoring
+ enabled: false
+dcaegen2:
+ enabled: false
+esr:
+ enabled: false
+log:
+ enabled: false
+message-router:
+ enabled: false
+mock:
+ enabled: false
+msb:
+ enabled: false
+multicloud:
+ enabled: false
+policy:
+ enabled: false
+portal:
+ enabled: false
+robot: # Robot Health Check
+ enabled: true
+sdc:
+ enabled: false
+sdnc:
+ enabled: false
+so: # Service Orchestrator
enabled: true
+
replicaCount: 1
+
liveness:
# necessary to disable liveness probe when setting breakpoints
# in debugger so K8s doesn't restart unresponsive container
enabled: true
-
+
# so server configuration
config:
# message router configuration
@@ -71,4 +106,12 @@ so:
# configure embedded mariadb
mariadb:
config:
- mariadbRootPassword: password \ No newline at end of file
+ mariadbRootPassword: password
+uui:
+ enabled: false
+vfc:
+ enabled: false
+vid:
+ enabled: false
+vnfsdk:
+ enabled: false \ No newline at end of file
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index be4d132b7e..0c3ff8526d 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -48,41 +48,41 @@ global:
# to customize the ONAP deployment.
#################################################################
aaf:
- enabled: false
+ enabled: true
aai:
- enabled: false
+ enabled: true
appc:
- enabled: false
+ enabled: true
clamp:
- enabled: false
+ enabled: true
cli:
- enabled: false
+ enabled: true
consul: # Consul Health Check Monitoring
- enabled: false
+ enabled: true
dcaegen2:
- enabled: false
+ enabled: true
esr:
- enabled: false
+ enabled: true
log:
- enabled: false
+ enabled: true
message-router:
- enabled: false
+ enabled: true
mock:
- enabled: false
+ enabled: true
msb:
- enabled: false
+ enabled: true
multicloud:
- enabled: false
+ enabled: true
policy:
- enabled: false
+ enabled: true
portal:
- enabled: false
+ enabled: true
robot: # Robot Health Check
enabled: true
sdc:
- enabled: false
+ enabled: true
sdnc:
- enabled: false
+ enabled: true
so: # Service Orchestrator
enabled: true
@@ -109,10 +109,10 @@ so: # Service Orchestrator
config:
mariadbRootPassword: password
uui:
- enabled: false
+ enabled: true
vfc:
- enabled: false
+ enabled: true
vid:
- enabled: false
+ enabled: true
vnfsdk:
- enabled: false
+ enabled: true