diff options
| author |   Dan Timoney <dt5972@att.com> | 2018-09-12 19:48:38 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-12 19:48:38 +0000 |
| commit | b588516cf0d3ecfd933210e5e58a2c934d4789ed (patch) | |
| tree | 3dded91d3b8518694de5e08dd9f3cd9355cad53d /odlsli | |
| parent | 12622054e9b501d4e7df9302cbfcd0b5968e3b59 (diff) | |
| parent | 268c5e1bbc6a14e79dca339566c1541b94c7a303 (diff) | |
Merge "Add dependencies for blueprint-processor"
Diffstat (limited to 'odlsli')
| -rw-r--r-- | odlsli/pom.xml | 15 | ||||
| -rw-r--r-- | odlsli/src/main/docker/Dockerfile | 9 |
2 files changed, 20 insertions, 4 deletions
diff --git a/odlsli/pom.xml b/odlsli/pom.xml index 7d9726ed..2fbe8c03 100644 --- a/odlsli/pom.xml +++ b/odlsli/pom.xml @@ -25,6 +25,7 @@ <properties> <image.name>onap/ccsdk-odlsli-image</image.name> <ccsdk.project.version>${project.version}</ccsdk.project.version> + <ccsdk.features.version>${project.version}</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> @@ -203,6 +204,20 @@ <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> </dependencies> <build> diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile index 9af3af90..8ba16f01 100644 --- a/odlsli/src/main/docker/Dockerfile +++ b/odlsli/src/main/docker/Dockerfile @@ -6,6 +6,7 @@ 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_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} @@ -20,8 +21,8 @@ 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 cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN cat $ODL_HOME/etc/org.apache.karaf.features.cfg.orig | sed -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO}, ${CCSDK_SLI_ADAPTORS_REPO}, ${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_REPO}|" > $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN echo featuresBoot=config,standard,region,package,kar,ssh,management,odl-restconf-all,odl-mdsal-all,odl-mdsal-apidocs,odl-daexim-all,ccsdk-sli-core-all,ccsdk-sli-adaptors-all,ccsdk-sli-northbound-all,ccsdk-sli-plugins-all,ccsdk-features-all >> $ODL_HOME/etc/org.apache.karaf.features.cfg # Create odl user RUN useradd odl @@ -32,8 +33,8 @@ RUN useradd odl # gpg --export --armor ${ANSIBLE_GPG_KEY} | apt-key add - && \ # apt-get update && \ # apt-get install -y ansible - -# Install ansible-opendaylight + +# Install ansible-opendaylight #RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight # Copy ccsdk install playbook |