diff options
| author |   Timoney, Dan (dt5972) <dt5972@att.com> | 2018-07-06 10:25:44 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dt5972@att.com> | 2018-07-06 10:25:44 -0400 |
| commit | ea56542af7139307acd2c9a6476e04ac40c278be (patch) | |
| tree | 23919de033b9981f31ed16e28e8ba8d65495346f | |
| parent | f6d5b0b1389e48c890f47e07cce720145adedee5 (diff) | |
Manually update feature boot
As workaround for issue using opendaylight-ansible, add features
to org.apache.karaf.features.cfg directly in Dockerfile. This
is intended as a temporary fix until LF provides a way for
us to git clone from https://git.opendaylight.org so we can
install and use opendaylight-ansible.
Change-Id: If21e82aa8cdfbada6a3a566c79960ed3f59e96ea
Issue-ID: CCSDK-285
Signed-off-by: Timoney, Dan (dt5972) <dt5972@att.com>
| -rw-r--r-- | odlsli/src/main/docker/Dockerfile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/odlsli/src/main/docker/Dockerfile b/odlsli/src/main/docker/Dockerfile index c895481b..9af3af90 100644 --- a/odlsli/src/main/docker/Dockerfile +++ b/odlsli/src/main/docker/Dockerfile @@ -21,25 +21,26 @@ 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 # 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 +#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 +#RUN ansible-galaxy install git+https://git.opendaylight.org/gerrit/integration/packaging/ansible-opendaylight # Copy ccsdk install playbook -COPY install_ccsdk.yml /tmp +#COPY install_ccsdk.yml /tmp # Install features in ODL -RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml +#RUN ansible-playbook -i "localhost," -c local /tmp/install_ccsdk.yml # copy deliverables to opt |