summaryrefslogtreecommitdiffstats
path: root/odlsli/odlsli-alpine
diff options
context:
space:
mode:
authorTimoney, Dan (dt5972) <dtimoney@att.com>2019-03-20 08:23:14 -0400
committerTimoney, Dan (dt5972) <dtimoney@att.com>2019-03-20 08:23:14 -0400
commit25364ba4d920bbd882abe5117dd170b53b3d54e3 (patch)
tree38a6398e2f42922fb8c44ea477d7324707331b10 /odlsli/odlsli-alpine
parent4d1e965d02b4e0c9609625795d9b2f8c533495fa (diff)
Disable messagerouter adaptor
Instead of installing ccsdk-sli-adaptors-all, install individual adaptors so we can exclude messagerouter for now, which is not coming up properly. Change-Id: I9c9dde2a843302083f57cf6465eab0e3e535778d Issue-ID: SDNC-701 Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlsli/odlsli-alpine')
-rw-r--r--odlsli/odlsli-alpine/pom.xml8
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile3
2 files changed, 8 insertions, 3 deletions
diff --git a/odlsli/odlsli-alpine/pom.xml b/odlsli/odlsli-alpine/pom.xml
index 6fe4a784..803441f8 100644
--- a/odlsli/odlsli-alpine/pom.xml
+++ b/odlsli/odlsli-alpine/pom.xml
@@ -33,7 +33,11 @@
<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.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>
+ -->
+ <ccsdk.adaptors.features>ccsdk-aai-service,ccsdk-ansible-adapter,ccsdk-grpc-client,ccsdk-netbox-client,csdk-mdsal-resource,ccsdk-resource-assignment,ccsdk-sql-resource</ccsdk.adaptors.features>
+ <ccsdk.odl.features>ccsdk-sli-core-all,${ccsdk.adaptors.features},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>
</properties>
@@ -151,13 +155,13 @@
<classifier>repo</classifier>
<type>zip</type>
</dependency>
- <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> -->
<dependency>
<groupId>org.onap.ccsdk.sli.northbound</groupId>
<artifactId>asdcApi-installer</artifactId>
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 2703a7d2..9d8b379d 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -22,7 +22,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 sed -i -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 sed -i -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 sed -i -e "\|featuresRepositories|s|$|, ${CCSDK_SLI_CORE_REPO},${CCSDK_SLI_NORTHBOUND_REPO}, ${CCSDK_SLI_PLUGINS_REPO}, ${CCSDK_FEATURES_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