diff options
Diffstat (limited to 'installation')
| -rw-r--r-- | installation/sdnc/pom.xml | 83 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 24 |
2 files changed, 94 insertions, 13 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 43d60015..3bb8e53e 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -61,6 +61,71 @@ <type>zip</type> <classifier>repo</classifier> </dependency> + <!-- SDNR Related Features : Start --> + <dependency> + <groupId>org.onap.ccsdk.features</groupId> + <artifactId>features-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features</groupId> + <artifactId>aafshiro-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>sdnr-northbound-features-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>oofpcipoc-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>CMNotify-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>ranSlice-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-northbound-installer</artifactId> + <version>${ccsdk.oran.a1adapter.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-installer</artifactId> + <version>${ccsdk.oran.a1adapter.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <!-- SDNR Related Features : End --> </dependencies> <build> @@ -145,7 +210,8 @@ <id>copy-dockerfile</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -164,7 +230,8 @@ <id>copy-scripts</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory> @@ -184,7 +251,8 @@ <id>copy-tarballs</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -205,7 +273,8 @@ <id>copy-data</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory> @@ -225,7 +294,8 @@ <id>copy-properties</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory> @@ -246,7 +316,8 @@ <id>copy-keystores</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 65b908ce..cdb6c896 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -16,7 +16,7 @@ ENV SDNC_SECUREPORT ${sdnc.secureport} ARG AAF=false -# Copy onap +# Copy deliverables to opt COPY opt /opt RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc RUN mkdir $ODL_HOME/current/certs @@ -25,15 +25,25 @@ RUN mkdir $ODL_HOME/current/certs COPY system /tmp/system RUN rsync -a /tmp/system $ODL_HOME -# Add odl-netconf-topology 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 "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg - -# Add SDNC repositories to boot repositories +# Add SDNC NORTHBOUND FEATURES repository ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features -RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg + +# Add CCSDK SDNR FEATURES repositories +ENV SDNR_FEATURES_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features,\ +mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features + +# Backing up existing karaf cfg and updating features boot and features repository +RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.sdnc.orig RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO},${SDNR_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg +# Add odl-netconf-topology to boot repositories +RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg # Add aaa-app-config.xml Only if AAF is set to true (being passed as an argument in docker-maven-plugin configuration) COPY aaa-app-config.xml /tmp/aaa-app-config.xml |