diff options
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/odlsli-alpine/pom.xml | 14 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/pom.xml | 588 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/src/main/docker/Dockerfile | 56 | ||||
| -rw-r--r-- | odlsli/pom.xml | 4 |
4 files changed, 9 insertions, 653 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml index 12059c79..5db3096a 100644 --- a/odlsli/odlsli-alpine/pom.xml +++ b/odlsli/odlsli-alpine/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.5.1</version> + <version>1.5.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-odlsli-alpine</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>0.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli-alpine</name> @@ -25,7 +25,7 @@ <image.name>onap/ccsdk-odlsli-alpine-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.features.version>0.7.0</ccsdk.features.version> + <ccsdk.features.version>0.7.1-SNAPSHOT</ccsdk.features.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <opendaylight.root>opt/opendaylight</opendaylight.root> @@ -36,10 +36,10 @@ <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features> <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - <ccsdk.sli.core.version>0.7.0</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>0.7.0</ccsdk.sli.adaptors.version> - <ccsdk.sli.northbound.version>0.7.0</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>0.7.0</ccsdk.sli.plugins.version> + <ccsdk.sli.core.version>0.7.1-SNAPSHOT</ccsdk.sli.core.version> + <ccsdk.sli.adaptors.version>0.7.1-SNAPSHOT</ccsdk.sli.adaptors.version> + <ccsdk.sli.northbound.version>0.7.1-SNAPSHOT</ccsdk.sli.northbound.version> + <ccsdk.sli.plugins.version>0.7.1-SNAPSHOT</ccsdk.sli.plugins.version> </properties> <dependencies> diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml deleted file mode 100644 index 0ac66f1c..00000000 --- a/odlsli/odlsli-ubuntu/pom.xml +++ /dev/null @@ -1,588 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - - <parent> - <groupId>org.onap.ccsdk.parent</groupId> - <artifactId>odlparent-lite</artifactId> - <version>1.5.1</version> - <relativePath/> - </parent> - - <groupId>org.onap.ccsdk.distribution</groupId> - <artifactId>distribution-odlsli-ubuntu</artifactId> - <version>0.7.0-SNAPSHOT</version> - <packaging>pom</packaging> - - <name>ccsdk-distribution :: odlsli-ubuntu</name> - <description>Creates Ubuntu-based ODLSLI Docker container</description> - <organization> - <name>openECOMP</name> - </organization> - - <properties> - <base.image.name>onap/ccsdk-odl-fluorine-ubuntu-image</base.image.name> - <image.name>onap/ccsdk-odlsli-image</image.name> - <ccsdk.project.version>${project.version}</ccsdk.project.version> - <ccsdk.build.timestamp>${maven.build.timestamp}</ccsdk.build.timestamp> - <ccsdk.features.version>0.6.0</ccsdk.features.version> - <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> - <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> - <opendaylight.root>opt/opendaylight</opendaylight.root> - <docker.push.phase>deploy</docker.push.phase> - <docker.verbose>true</docker.verbose> - <ansible.gpg.key>93C4A3FD7BB9C367</ansible.gpg.key> - <odl.features.extra>odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs, odl-daexim-all,odl-restconf-nb-rfc8040</odl.features.extra> - <ccsdk.odl.features>ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all</ccsdk.odl.features> - <odl.boot.features.extra>${odl.features.extra},${ccsdk.odl.features}</odl.boot.features.extra> - - <ccsdk.sli.core.version>0.6.0</ccsdk.sli.core.version> - <ccsdk.sli.adaptors.version>0.6.0</ccsdk.sli.adaptors.version> - <ccsdk.sli.northbound.version>0.6.0</ccsdk.sli.northbound.version> - <ccsdk.sli.plugins.version>0.6.0</ccsdk.sli.plugins.version> - </properties> - - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>dependencies</artifactId> - <version>${project.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>dblib-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>filters-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sli-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliapi-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>sliPluginUtils-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>utils-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.core</groupId> - <artifactId>slicore-features-installer</artifactId> - <version>${ccsdk.sli.core.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>aai-service-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>ansible-adapter-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>base-http-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>mdsal-resource-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> - <artifactId>publisher.installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>netbox-client-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>resource-assignment-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>saltstack-adapter-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sql-resource-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.adaptors</groupId> - <artifactId>sliadaptors-features-installer</artifactId> - <version>${ccsdk.sli.adaptors.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>asdcApi-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>dataChange-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>lcm-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.northbound</groupId> - <artifactId>slinorthbound-features-installer</artifactId> - <version>${ccsdk.sli.northbound.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>properties-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>restapi-call-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>template-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>restconf-client-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sshapi-call-node-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.sli.plugins</groupId> - <artifactId>sliplugins-features-installer</artifactId> - <version>${ccsdk.sli.plugins.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features</groupId> - <artifactId>features-installer</artifactId> - <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features</groupId> - <artifactId>blueprints-processor-installer</artifactId> - <version>${ccsdk.features.version}</version> - <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> - <dependency> - <groupId>org.onap.ccsdk.features</groupId> - <artifactId>aafshiro-installer</artifactId> - <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>sdnr-northbound-features-installer</artifactId> - <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>oofpcipoc-installer</artifactId> - <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - <dependency> - <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> - <artifactId>a1Adapter-installer</artifactId> - <version>${ccsdk.features.version}</version> - <classifier>repo</classifier> - <type>zip</type> - </dependency> - </dependencies> - - <build> - <extensions> - <extension> - <!-- this extension is required by wagon in order to pass the proxy --> - <groupId>org.apache.maven.wagon</groupId> - <artifactId>wagon-http-lightweight</artifactId> - <version>2.2</version> - </extension> - </extensions> - <plugins> - - - <plugin> - <groupId>org.codehaus.groovy.maven</groupId> - <artifactId>gmaven-plugin</artifactId> - <executions> - <execution> - <phase>validate</phase> - <goals> - <goal>execute</goal> - </goals> - <configuration> - <source>${basedir}/../../src/main/scripts/TagVersion.groovy</source> - </configuration> - </execution> - </executions> - </plugin> - - - - <plugin> - <artifactId>maven-resources-plugin</artifactId> - <version>2.6</version> - <executions> - <execution> - <id>copy-dockerfile</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>src/main/docker</directory> - <includes> - <include>Dockerfile</include> - </includes> - <filtering>true</filtering> - </resource> - </resources> - </configuration> - </execution> - - <execution> - <id>copy-scripts</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/bin</outputDirectory> - <resources> - <resource> - <directory>../src/main/scripts</directory> - <includes> - <include>*.sh</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - - <execution> - <id>copy-odl-resources</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>../src/main/resources</directory> - <includes> - <include>idmlight.db.mv.db</include> - <include>org.ops4j.pax.logging.cfg</include> - <include>install_ccsdk.yml</include> - <include>ansible-sources.list</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-config</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <resources> - <resource> - <directory>../src/main/resources</directory> - <includes> - <include>org.ops4j.pax.logging.cfg</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-data</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data</outputDirectory> - <resources> - <resource> - <directory>../src/main/resources</directory> - <includes> - <include>*.dump</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-properties</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/properties</outputDirectory> - <resources> - <resource> - <directory>../src/main/properties</directory> - <includes> - <include>*.properties</include> - <include>*.vt</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - <execution> - <id>copy-keystores</id> - <goals> - <goal>copy-resources</goal> - </goals><!-- here the phase you need --> - <phase>validate</phase> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk/data/stores</outputDirectory> - <resources> - <resource> - <directory>../src/main/stores</directory> - <includes> - <include>*.jks</include> - </includes> - <filtering>false</filtering> - </resource> - </resources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-dependency-plugin</artifactId> - <version>3.0.2</version> - <executions> - <execution> - <id>unpack features</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack-dependencies</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/docker-stage</outputDirectory> - <excludeTransitive>true</excludeTransitive> - </configuration> - </execution> - <execution> - <id>unpack dgs</id> - <phase>generate-sources</phase> - <goals> - <goal>unpack</goal> - </goals> - <configuration> - <outputDirectory>${basedir}/target/docker-stage/opt/onap/ccsdk</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>platform-logic-installer</artifactId> - <version>${project.version}</version> - <type>zip</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>exec-maven-plugin</artifactId> - <version>1.5.0</version> - <executions> - - <execution> - <id>change shell permissions</id> - <phase>process-sources</phase> - <goals> - <goal>exec</goal> - </goals> - <configuration> - <executable>/usr/bin/find</executable> - <arguments> - <argument>${basedir}/target/docker-stage/opt/onap/ccsdk</argument> - <argument>-name</argument> - <argument>*.sh</argument> - <argument>-exec</argument> - <argument>chmod</argument> - <argument>+x</argument> - <argument>{}</argument> - <argument>;</argument> - </arguments> - </configuration> - </execution> - </executions> - </plugin> - - - </plugins> - </build> - - <profiles> - <profile> - <id>docker</id> - <build> - <plugins> - <plugin> - <groupId>io.fabric8</groupId> - <artifactId>docker-maven-plugin</artifactId> - <version>0.16.5</version> - <inherited>false</inherited> - <configuration> - <images> - <image> - <name>${image.name}</name> - <build> - <cleanup>try</cleanup> - <dockerFileDir>${basedir}/target/docker-stage</dockerFileDir> - <dockerFile>${basedir}/target/docker-stage/Dockerfile</dockerFile> - <tags> - <tag>${project.docker.latestminortag.version}</tag> - <tag>${project.docker.latestfulltag.version}</tag> - <tag>${project.docker.latesttagtimestamp.version}</tag> - </tags> - </build> - </image> - </images> - </configuration> - <executions> - <execution> - <id>generate-images</id> - <phase>package</phase> - <goals> - <goal>build</goal> - </goals> - </execution> - - <execution> - <id>push-images</id> - <phase>${docker.push.phase}</phase> - <goals> - <goal>build</goal> - <goal>push</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - </profile> - </profiles> -</project> diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile deleted file mode 100644 index 546b4f3f..00000000 --- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile +++ /dev/null @@ -1,56 +0,0 @@ -# Base ubuntu with added packages needed for open ecomp -FROM ${base.image.name}:${project.docker.latestfulltag.version} -MAINTAINER CCSDK Team (onap-ccsdk@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 -ENV ODL_HOME /opt/opendaylight -ENV SDNC_CONFIG_DIR /opt/onap/ccsdk/data/properties -ENV CCSDK_SLI_CORE_REPO mvn:org.onap.ccsdk.sli.core/ccsdk-sli-core-all/${ccsdk.sli.core.version}/xml/features -ENV CCSDK_SLI_ADAPTORS_REPO mvn:org.onap.ccsdk.sli.adaptors/ccsdk-sli-adaptors-all/${ccsdk.sli.adaptors.version}/xml/features -ENV CCSDK_FEATURES_REPO mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features -ENV CCSDK_FEATURES_SDNR_WT_REPO mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features -ENV CCSDK_SLI_NORTHBOUND_REPO mvn:org.onap.ccsdk.sli.northbound/ccsdk-sli-northbound-all/${ccsdk.sli.northbound.version}/xml/features -ENV CCSDK_SLI_PLUGINS_REPO mvn:org.onap.ccsdk.sli.plugins/ccsdk-sli-plugins-all/${ccsdk.sli.plugins.version}/xml/features -ENV ANSIBLE_GPG_KEY ${ansible.gpg.key} -ENV ODL_BOOT_FEATURES_EXTRA ${odl.boot.features.extra} - - -# copy the opendaylight credentials -COPY idmlight.db.mv.db $ODL_HOME/data - - -# copy CCSDK mvn artifacts to ODL repository -COPY system /tmp/system -RUN rsync -a /tmp/system $ODL_HOME && rm -rf /tmp/system - -# Add CCSDK 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|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}, ${CCSDK_FEATURES_SDNR_WT_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg - -# Create odl user -RUN useradd odl - -# Install ansible -#COPY ansible-sources.list /etc/apt/sources.list.d -#RUN gpg --keyserver hkp://keyserver.ubuntu.com:80 --recv ${ANSIBLE_GPG_KEY} && \ -# gpg --export --armor ${ANSIBLE_GPG_KEY} | apt-key add - && \ -# apt-get update && \ -# apt-get install -y ansible - -# Install ansible-opendaylight -#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight - -# Copy ccsdk install playbook -#COPY install_ccsdk.yml /tmp - -# Install features in ODL -#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml - - -# copy deliverables to opt -COPY opt /opt -COPY org.ops4j.pax.logging.cfg /opt/opendaylight/etc/org.ops4j.pax.logging.cfg - - -ENTRYPOINT /opt/onap/ccsdk/bin/startODL.sh -EXPOSE 8181 diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 68f12ea1..c572198c 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -5,11 +5,11 @@ <parent> <groupId>org.onap.ccsdk.distribution</groupId> <artifactId>distribution-root</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>0.7.1-SNAPSHOT</version> </parent> <artifactId>distribution-odlsli</artifactId> - <version>0.7.0-SNAPSHOT</version> + <version>0.7.1-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-distribution :: odlsli</name> |