diff options
| author |   Dominic Lunanuova <dgl@research.att.com> | 2018-04-30 19:01:31 +0000 |
|---|---|---|
| committer |   BorislavG <Borislav.Glozman@amdocs.com> | 2018-05-08 08:56:15 +0000 |
| commit | 1ba2b2560856dae9f921745ca1298bb19ea57a96 (patch) | |
| tree | 4012c4e36173f81569df2bd88d549c6e4a07d079 /kubernetes/onap | |
| parent | 5550c20ed2dda8648c2bc5fec6b4e0d4b2b18add (diff) | |
Merge message-router chart under dmaap
Borislav: Fixed Makefile and renamed charts.
Also cosmetic fixes.
Includes corrections for the service name of MR used by dbc to
be "message-router", which matches the message-router chart
Patchset 2: standardize abbreviation for bus-controller to be "dbc"
Patchset 3: correct references in README to match what is deployed
Patchset 4: blew previous commit. Also added dmaap/Makefile lint step
Change-Id: I36c07c7c1200f8e23ae12bd7357a5626346dcccd
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Issue-ID: DMAAP-386
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Diffstat (limited to 'kubernetes/onap')
| -rw-r--r-- | kubernetes/onap/requirements.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/dev.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/resources/environments/disable-allcharts.yaml | 4 | ||||
| -rw-r--r-- | kubernetes/onap/values.yaml | 2 |
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: |