diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-04 18:02:21 -0500 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-02-05 11:51:12 -0500 |
| commit | aa9d825d1d6be1b9bd9611b27607735f6ae1db88 (patch) | |
| tree | 745feaaa11d4abe706a54d158beaed5f04c7c72c /odlsli/odlsli-ubuntu | |
| parent | a5a96e3da7da19815497a72be4610ab929d25441 (diff) | |
Fix Fluorine installation
Fix updates to features.cfg for Flourine.
Change-Id: Icb8d4dc2ed98ac71a8f0ef1c8fe68729091436c5
Issue-ID: CCSDK-489
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
Diffstat (limited to 'odlsli/odlsli-ubuntu')
| -rw-r--r-- | odlsli/odlsli-ubuntu/pom.xml | 3 | ||||
| -rw-r--r-- | odlsli/odlsli-ubuntu/src/main/docker/Dockerfile | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/odlsli/odlsli-ubuntu/pom.xml b/odlsli/odlsli-ubuntu/pom.xml index e525be2f..488692c9 100644 --- a/odlsli/odlsli-ubuntu/pom.xml +++ b/odlsli/odlsli-ubuntu/pom.xml @@ -31,6 +31,9 @@ <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.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> </properties> <dependencies> diff --git a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile index 455bdd79..fd95cba6 100644 --- a/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile +++ b/odlsli/odlsli-ubuntu/src/main/docker/Dockerfile @@ -21,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}, ${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 +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 "\|featuresBoot[^a-zA-Z]|s|$|,${ODL_BOOT_FEATURES_EXTRA}|" $ODL_HOME/etc/org.apache.karaf.features.cfg # Create odl user RUN useradd odl |