From: jhh <jorge.hernandez-herrero@att.com>
Date: Thu, 4 Apr 2019 18:51:20 +0000 (-0500)
Subject: Add lifecycle feature to image.
X-Git-Tag: 1.4.0~20
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=07e29100f99036fe7170b7ff43dca651983b888d;p=policy%2Fdrools-applications.git

Add lifecycle feature to image.

Change-Id: I0c3ea69935dcaca402061d9ea9a20db7ca022603
Issue-ID: POLICY-1608
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---

diff --git a/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties
index 054be3cb6..e54289ec6 100644
--- a/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties
+++ b/controlloop/common/feature-controlloop-usecases/src/main/feature/config/usecases-controller.properties
@@ -20,7 +20,7 @@
 
 controller.name=usecases
 
-dmaap.source.topics=${env:PDPD_CONFIGURATION_TOPIC},${env:DCAE_TOPIC},APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
+dmaap.source.topics=PDPD-CONFIGURATION,DCAE_TOPIC,APPC-CL,APPC-LCM-WRITE,SDNR-CL-RSP
 
 dmaap.source.topics.PDPD-CONFIGURATION.effectiveTopic=${env:PDPD_CONFIGURATION_TOPIC}
 dmaap.source.topics.PDPD-CONFIGURATION.servers=${env:DMAAP_SERVERS}
diff --git a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
index 1f0527e44..c5248ee74 100644
--- a/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
+++ b/controlloop/packages/docker-controlloop/src/main/docker/Dockerfile
@@ -23,10 +23,10 @@ RUN . ${POLICY_HOME}/etc/profile.d/env.sh && \
         --settings=${POLICY_HOME}/etc/m2/standalone-settings.xml \
         -DartifactId=feature-controlloop-management \
         -DgroupId=org.onap.policy.drools-applications.controlloop.common -Dversion=${BUILD_VERSION_APP_CL} && \
-    ${POLICY_HOME}/bin/features install healthcheck distributed-locking && \
+    ${POLICY_HOME}/bin/features install healthcheck distributed-locking lifecycle && \
     ${POLICY_HOME}/bin/features install controlloop-utils controlloop-trans controlloop-management && \
     ${POLICY_HOME}/bin/features install controlloop-amsterdam controlloop-usecases && \
-    ${POLICY_HOME}/bin/features enable healthcheck distributed-locking && \
+    ${POLICY_HOME}/bin/features enable healthcheck distributed-locking lifecycle && \
     ${POLICY_HOME}/bin/features enable controlloop-trans controlloop-management && \
     ${POLICY_HOME}/bin/features enable controlloop-amsterdam controlloop-usecases && \
     rm ${POLICY_INSTALL}/*.zip ${POLICY_INSTALL}/*.gz 2> /dev/null