6 files changed, 15 insertions, 12 deletions
diff --git a/kubernetes/onap/Chart.yaml b/kubernetes/onap/Chart.yaml
index 1050e1a38b..928399dfb0 100644
--- a/kubernetes/onap/Chart.yaml
+++ b/kubernetes/onap/Chart.yaml
@@ -21,3 +21,4 @@ home: https://www.onap.org/
 sources:
 - https://gerrit.onap.org/r/#/admin/projects/
 icon: https://wiki.onap.org/download/thumbnails/1015829/onap_704x271%20copy.png?version=1&modificationDate=1488326334000&api=v2
+tillerVersion: "~2.8.2"
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 03ee94db6e..97bcea47b0 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -60,10 +60,10 @@ dependencies:
     version: ~2.0.0
     repository: '@local'
     condition: log.enabled
-  - name: mock
-    version: ~0.1.0
+  - name: sniro-emulator
+    version: ~2.0.0
     repository: '@local'
-    condition: mock.enabled
+    condition: sniro-emulator.enabled
   - name: msb
     version: ~2.0.0
     repository: '@local'
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 4379f64d55..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
@@ -71,7 +70,7 @@ esr:
   enabled: false
 log:
   enabled: false
-mock:
+sniro-emulator:
   enabled: false
 oof:
   enabled: false
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 819cc7a2ab..0f669beaab 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -45,7 +45,7 @@ esr:
   enabled: false
 log:
   enabled: false
-mock:
+sniro-emulator:
   enabled: false
 msb:
   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 28b33fcc6d..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)
@@ -80,9 +85,7 @@ esr:
   enabled: true
 log:
   enabled: true
-message-router:
-  enabled: true
-mock:
+sniro-emulator:
   enabled: true
 oof:
   enabled: true