4 files changed, 6 insertions, 8 deletions
diff --git a/kubernetes/onap/requirements.yaml b/kubernetes/onap/requirements.yaml
index 98a6e2fa2e..03ee94db6e 100644
--- a/kubernetes/onap/requirements.yaml
+++ b/kubernetes/onap/requirements.yaml
@@ -60,10 +60,6 @@ dependencies:
     version: ~2.0.0
     repository: '@local'
     condition: log.enabled
-  - name: message-router
-    version: ~2.0.0
-    repository: '@local'
-    condition: message-router.enabled
   - name: mock
     version: ~0.1.0
     repository: '@local'
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 42f8c2fabf..4379f64d55 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -65,12 +65,12 @@ consul:
   enabled: false
 dcaegen2:
   enabled: false
+dmaap:
+  enabled: false
 esr:
   enabled: false
 log:
   enabled: false
-message-router:
-  enabled: false
 mock:
   enabled: false
 oof:
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 09a8e5ed02..819cc7a2ab 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -39,12 +39,12 @@ consul:
   enabled: false
 dcaegen2:
   enabled: false
+dmaap:
+  enabled: false
 esr:
   enabled: false
 log:
   enabled: false
-message-router:
-  enabled: false
 mock:
   enabled: false
 msb:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 95e38b93c0..28b33fcc6d 100644
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -74,6 +74,8 @@ consul:
   enabled: true
 dcaegen2:
   enabled: true
+dmaap:
+  enabled: true
 esr:
   enabled: true
 log: