4 files changed, 34 insertions, 6 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index d053162458..9385adea9a 100755
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -55,7 +55,7 @@ dependencies:
   - name: contrib
     version: ~6.x-0
     repository: '@local'
-    condition: contrib.enabled
+    condition: global.addTestingComponents
   - name: dcaegen2
     version: ~6.x-0
     repository: '@local'
diff --git a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
index c9de7f98a8..5b59c65db7 100644
--- a/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
+++ b/kubernetes/onap/resources/overrides/onap-5g-network-slicing.yaml
@@ -126,7 +126,7 @@ pomba:
 portal:
   enabled: true
 robot:
-  enabled: false
+  enabled: true
   config:
     # openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment
     openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e"
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index d302298b1a..005bf1c726 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -15,11 +15,12 @@
 ###################################################################
 # This override file enables helm charts for all ONAP applications.
 ###################################################################
+global:
+  addTestingComponents: &testing true
 cassandra:
   enabled: true
 mariadb-galera:
   enabled: true
-
 aaf:
   enabled: true
 aai:
@@ -32,9 +33,12 @@ clamp:
   enabled: true
 cli:
   enabled: true
-consul:
-  enabled: true
+# Today, "contrib" chart that hosting these components must also be enabled
+# in order to make it work. So `contrib.enabled` must have the same value than
+# addTestingComponents
 contrib:
+  enabled: *testing
+consul:
   enabled: true
 dcaegen2:
   enabled: true
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index abbbdcd757..623339466c 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -24,6 +24,19 @@ global:
   nodePortPrefix: 302
   nodePortPrefixExt: 304
 
+
+  # Install test components
+  # test components are out of the scope of ONAP but allow to have a entire
+  # environment to test the different features of ONAP
+  # Current tests environments provided:
+  #  - netbox (needed for CDS IPAM)
+  #  - AWX (needed for XXX)
+  #  - EJBCA Server (needed for CMPv2 tests)
+  # Today, "contrib" chart that hosting these components must also be enabled
+  # in order to make it work. So `contrib.enabled` must have the same value than
+  # addTestingComponents
+  addTestingComponents: &testing false
+
   # ONAP Repository
   # Uncomment the following to enable the use of a single docker
   # repository but ONLY if your repository mirrors all ONAP
@@ -36,12 +49,17 @@ global:
 
   # readiness check - temporary repo until images migrated to nexus3
   readinessRepository: oomk8s
+  readinessImage: readiness-check:2.0.2
   # logging agent - temporary repo until images migrated to nexus3
   loggingRepository: docker.elastic.co
 
   # image pull policy
   pullPolicy: Always
 
+  # default clusterName
+  # {{ template "common.fullname" . }}.{{ template "common.namespace" . }}.svc.{{ .Values.global.clusterName }}
+  clusterName: cluster.local
+
   # default mount path root directory referenced
   # by persistent volumes and log files
   persistence:
@@ -76,6 +94,9 @@ global:
   aafEnabled: true
   aafAgentImage: onap/aaf/aaf_agent:2.1.20
 
+  # Enabling CMPv2
+  cmpv2Enabled: true
+
   # TLS
   # Set to false if you want to disable TLS for NodePorts. Be aware that this
   # will loosen your security.
@@ -144,8 +165,11 @@ cli:
   enabled: false
 consul:
   enabled: false
+# Today, "contrib" chart that hosting these components must also be enabled
+# in order to make it work. So `contrib.enabled` must have the same value than
+# addTestingComponents
 contrib:
-  enabled: false
+  enabled: *testing
 dcaegen2:
   enabled: false
 dcaemod: