5 files changed, 37 insertions, 19 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 8c9c12845b..97bcea47b0 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -60,14 +60,10 @@ dependencies:
     version: ~2.0.0
     repository: '@local'
     condition: log.enabled
-  - name: message-router
+  - name: sniro-emulator
     version: ~2.0.0
     repository: '@local'
-    condition: message-router.enabled
-  - name: mock
-    version: ~0.1.0
-    repository: '@local'
-    condition: mock.enabled
+    condition: sniro-emulator.enabled
   - name: msb
     version: ~2.0.0
     repository: '@local'
@@ -84,6 +80,10 @@ dependencies:
     version: ~2.0.0
     repository: '@local'
     condition: portal.enabled
+  - name: oof
+    version: ~2.0.0
+    repository: '@local'
+    condition: oof.enabled
   - name: robot
     version: ~2.0.0
     repository: '@local'
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 651cb9160e..e8d1eb1392 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -29,7 +29,6 @@ global:
   # docker images. This includes all images from dockerhub and
   # any other repository that hosts images for ONAP components.
   #repository: nexus3.onap.org:10001
-  #repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
 
   # readiness check - temporary repo until images migrated to nexus3
   readinessRepository: oomk8s
@@ -65,13 +64,15 @@ consul:
   enabled: false
 dcaegen2:
   enabled: false
+dmaap:
+  enabled: false
 esr:
   enabled: false
 log:
   enabled: false
-message-router:
+sniro-emulator:
   enabled: false
-mock:
+oof:
   enabled: false
 msb:
   enabled: false
@@ -128,4 +129,4 @@ vfc:
 vid:
   enabled: false
 vnfsdk:
-  enabled: false
-\ No newline at end of file
+  enabled: false
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 7e27a316cb..0f669beaab 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -39,18 +39,20 @@ consul:
   enabled: false
 dcaegen2:
   enabled: false
+dmaap:
+  enabled: false
 esr:
   enabled: false
 log:
   enabled: false
-message-router:
-  enabled: false
-mock:
+sniro-emulator:
   enabled: false
 msb:
   enabled: false
 multicloud:
   enabled: false
+oof:
+  enabled: false
 policy:
   enabled: false
 portal:
@@ -70,4 +72,4 @@ vfc:
 vid:
   enabled: false
 vnfsdk:
-  enabled: false
-\ No newline at end of file
+  enabled: false
diff --git a/kubernetes/onap/templates/secrets.yaml b/kubernetes/onap/templates/secrets.yaml
index 2345be1972..145b55f36d 100644
--- a/kubernetes/onap/templates/secrets.yaml
+++ b/kubernetes/onap/templates/secrets.yaml
@@ -23,5 +23,5 @@ metadata:
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
 data:
-  .dockercfg: {{ .Values.global.repositorySecret | default .Values.repositorySecret }}
-type: kubernetes.io/dockercfg
-\ No newline at end of file
+  .dockercfg: {{ include "common.repository.secret" . }}
+type: kubernetes.io/dockercfg
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 470fdfb031..d0b06630fd 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -29,7 +29,9 @@ global:
   # docker images. This includes all images from dockerhub and
   # any other repository that hosts images for ONAP components.
   #repository: nexus3.onap.org:10001
-  repositorySecret: eyJuZXh1czMub25hcC5vcmc6MTAwMDEiOnsidXNlcm5hbWUiOiJkb2NrZXIiLCJwYXNzd29yZCI6ImRvY2tlciIsImVtYWlsIjoiQCIsImF1dGgiOiJaRzlqYTJWeU9tUnZZMnRsY2c9PSJ9fQ==
+  repositoryCred:
+    user: docker
+    password: docker
 
   # readiness check - temporary repo until images migrated to nexus3
   readinessRepository: oomk8s
@@ -47,6 +49,9 @@ global:
   # flag to enable debugging - application support required
   debugEnabled: false
 
+# Repository for creation of nexus3.onap.org secret
+repository: nexus3.onap.org:10001
+
 
 #################################################################
 # Enable/disable and configure helm charts (ie. applications)
@@ -58,6 +63,14 @@ aai:
   enabled: true
 appc:
   enabled: true
+  config:
+    openStackType: OpenStackProvider
+    openStackName: OpenStack
+    openStackKeyStoneUrl: http://localhost:8181/apidoc/explorer/index.html
+    openStackServiceTenantName: default
+    openStackDomain: default
+    openStackUserName: admin
+    openStackEncryptedPassword: admin
 clamp:
   enabled: true
 cli:
@@ -66,13 +79,15 @@ consul:
   enabled: true
 dcaegen2:
   enabled: true
+dmaap:
+  enabled: true
 esr:
   enabled: true
 log:
   enabled: true
-message-router:
+sniro-emulator:
   enabled: true
-mock:
+oof:
   enabled: true
 msb:
   enabled: true