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/message-router/resources/config/dmaap/cadi.properties | |
| 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/message-router/resources/config/dmaap/cadi.properties')
| -rwxr-xr-x | kubernetes/message-router/resources/config/dmaap/cadi.properties | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/kubernetes/message-router/resources/config/dmaap/cadi.properties b/kubernetes/message-router/resources/config/dmaap/cadi.properties deleted file mode 100755 index 9079794517..0000000000 --- a/kubernetes/message-router/resources/config/dmaap/cadi.properties +++ /dev/null @@ -1,35 +0,0 @@ -# Copyright © 2017 Amdocs, Bell Canada, AT&T -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -basic_realm=openecomp.org -basic_warn=TRUE - -cadi_loglevel=DEBUG -#cadi_keyfile=target/swm/package/nix/dist_files/appl/${artifactId}/etc/keyfile2 -cadi_keyfile=/appl/dmaapMR1/etc/keyfile -# Configure AAF -aaf_url=https://DME2RESOLVE/service=org.openecomp.authz.AuthorizationService/version=2.0/envContext=DEV/routeOffer=BAU_SE - -aaf_id=dgl@openecomp.org -aaf_password=enc:f2u5br1mh29M02- -aaf_timeout=5000 -aaf_clean_interval=1200000 -aaf_user_expires=60000 -aaf_high_count=1000000 - - -# The following properties are being set by the AJSC Container and should NOT need to be set here. -AFT_LATITUDE=33.823589 -AFT_LONGITUDE=-84.366982 -AFT_ENVIRONMENT=AFTUAT |