[DMAAP] Introduce drprov-client
Introduce the drprov-client (replaces dbc-client) and use
it to provision data router feeds and subscriptions for
DCAE datafile collector and pm-mapper.
- Update the common dmaap provisioning template to use
drprov-client instead of dbc-client.
- Add drprov-client image to the repository generator.
- Update the dcaegen2-services-common configMap template
to generate JSON files suitable for provisioning data
router directly.
- Update the dcaegen2-services-common deployment template
to use drprov-client as an init container instead of
dbc-client.
- Update dcae-datafile-collector and pm-mapper values.yaml
to format feed and subscription data properly for
drprov-client.
- Update versions for datarouter-node and datarouter-prov
- Update dependencies for DCAE datafile-collector and
pm-mapper, which no longer depend on DMAAP bus
controller.
Issue-ID: DMAAP-1893
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: Ia090365428362ff6aa94cfb4096ee4c6b554b480
diff --git a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
index b9e7a39..26bbd37 100644
--- a/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
+++ b/kubernetes/dcaegen2-services/components/dcae-datafile-collector/values.yaml
@@ -89,11 +89,12 @@
create: true
# Dependencies
+# Waiting for dmaap-dr-node (which depends on dmaap-dr-prov)
+# to be sure that we can provision the DR feed that's needed
readinessCheck:
wait_for:
containers:
- - dmaap-bc
- - dmaap-provisioning-job
+ - dmaap-dr-node
- message-router
# Probe Configuration
@@ -166,10 +167,10 @@
streams_publishes:
PM_MEAS_FILES:
dmaap_info:
- publisher_id: ${DR_FILES_PUBLISHER_ID_0}
+ publisher_id: "dummy_id"
location: loc00
- log_url: ${DR_LOG_URL_0}
- publish_url: ${DR_FILES_PUBLISHER_URL_0}
+ log_url: ${DR_FEED_LOGURL_0}
+ publish_url: ${DR_FEED_PUBURL_0}
username: ${DR_USERNAME}
password: ${DR_PASSWORD}
type: data_router
@@ -187,24 +188,17 @@
# DataRouter Feed Configuration
drFeedConfig:
- feedName: bulk_pm_feed
- owner: dcaecm
feedVersion: "0.0"
- asprClassification: unclassified
+ classification: unclassified
feedDescription: DFC Feed Creation
-
-# DataRouter Publisher Configuration
-drPubConfig:
- - feedName: bulk_pm_feed
- username: ${DR_USERNAME}
- userpwd: ${DR_PASSWORD}
- dcaeLocationName: loc00
+ publisher:
+ username: ${DR_USERNAME}
+ password: ${DR_PASSWORD}
# ConfigMap Configuration for Feed, Dr_Publisher
volumes:
- name: feeds-config
path: /opt/app/config/feeds
- - name: drpub-config
- path: /opt/app/config/dr_pubs
# Resource Limit Flavor -By Default Using Small
flavor: small