summaryrefslogtreecommitdiffstats
path: root/odlsli/odlsli-alpine/src/main
diff options
context:
space:
mode:
authorjanani b <janani.b@huawei.com>2019-03-22 14:37:52 +0530
committerDan Timoney <dtimoney@att.com>2019-03-25 16:55:17 +0000
commitc7bc0f707ba03ebf6b96505e60284432e59617a1 (patch)
treefed7ff67569547ec38007396d9f12cf13d7ecc40 /odlsli/odlsli-alpine/src/main
parent43a582e191786fac59b16e5651e387a0558e484f (diff)
Restconf-nb-rfc4080 to be in boot up feature
Adding ODL dependency required for RestconfClient in the boot features Issue-ID: CCSDK-1045 Change-Id: I7f850cf9b6ef3ac489fc8daaaee17af47f2263ba Signed-off-by: janani b <janani.b@huawei.com>
Diffstat (limited to 'odlsli/odlsli-alpine/src/main')
-rw-r--r--odlsli/odlsli-alpine/src/main/docker/Dockerfile2
-rw-r--r--odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml1
2 files changed, 2 insertions, 1 deletions
diff --git a/odlsli/odlsli-alpine/src/main/docker/Dockerfile b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
index 9d8b379d..c2206ea5 100644
--- a/odlsli/odlsli-alpine/src/main/docker/Dockerfile
+++ b/odlsli/odlsli-alpine/src/main/docker/Dockerfile
@@ -23,7 +23,7 @@ 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_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
diff --git a/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml b/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml
index c478bfea..e09eceba 100644
--- a/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml
+++ b/odlsli/odlsli-alpine/src/main/resources/install_ccsdk.yml
@@ -9,6 +9,7 @@
- odl-mdsal-all
- odl-mdsal-apidocs
- odl-daexim-all
+ - odl-restconf-nb-rfc8040
- ccsdk-sli-core-all
- ccsdk-sli-adaptors-all
- ccsdk-sli-northbound-all