diff options
| author |   Herbert Eiselt <herbert.eiselt@highstreet-technologies.com> | 2019-05-09 17:18:57 +0200 |
|---|---|---|
| committer |   Dan Timoney <dtimoney@att.com> | 2019-05-16 13:43:14 +0000 |
| commit | 9fda47895727309b1bfa5b67d3d87defa2633d51 (patch) | |
| tree | ac10c5c302b4231a3b36fd46904944bb2d038235 | |
| parent | ca2bc3fbd5767abe04cf85a880b6706ec8c676f1 (diff) | |
SDNR Add sdnr feature to SDNC
Add sdnr wt dependency to pom and Dockerfiles
Change-Id: Id6338b57e62e7c543ebd0b94d9cba90172caeab5
Issue-ID: SDNC-741
Signed-off-by: Herbert Eiselt <herbert.eiselt@highstreet-technologies.com>
Former-commit-id: af5850291ca51e7714aecefec50783778b4fb256
| -rw-r--r-- | installation/sdnc/pom.xml | 7 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 3 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/standalone.Dockerfile | 3 |
3 files changed, 11 insertions, 2 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index db142ff4..b9e3b145 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -78,6 +78,13 @@ <classifier>repo</classifier> <type>zip</type> </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> + <version>${ccsdk.features.version}</version> + <classifier>repo</classifier> + <type>zip</type> + </dependency> </dependencies> <build> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index ff5189e0..d4b3c642 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -12,6 +12,7 @@ ENV SSL_CERTS_DIR /etc/ssl/certs ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features +ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features ENV SDNC_KEYSTORE ${sdnc.keystore} ENV SDNC_KEYPASS ${sdnc.keypass} ENV SDNC_SECUREPORT ${sdnc.secureport} @@ -29,7 +30,7 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system # Add SDNC repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}, ${SDNR_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}, ${SDNR_NORTHBOUND_REPO}, ${SDNR_WT_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg diff --git a/installation/sdnc/src/main/docker/standalone.Dockerfile b/installation/sdnc/src/main/docker/standalone.Dockerfile index f1c8faa2..15376aaa 100755 --- a/installation/sdnc/src/main/docker/standalone.Dockerfile +++ b/installation/sdnc/src/main/docker/standalone.Dockerfile @@ -12,6 +12,7 @@ ENV SSL_CERTS_DIR /etc/ssl/certs ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features ENV SDNR_NORTHBOUND_REPO mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features +ENV SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features ENV SDNC_KEYSTORE ${sdnc.keystore} ENV SDNC_KEYPASS ${sdnc.keypass} ENV SDNC_SECUREPORT ${sdnc.secureport} @@ -29,7 +30,7 @@ RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system # Add SDNC repositories to boot repositories RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}, ${SDNR_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}, ${SDNR_NORTHBOUND_REPO}, ${SDNR_WT_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all, sdnr-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg |