diff options
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/dev/vagrant/bootstrap.sh | 2 | ||||
| -rw-r--r-- | contrib/template-override/opendaylight-template-overrides.j2 | 22 |
2 files changed, 23 insertions, 1 deletions
diff --git a/contrib/dev/vagrant/bootstrap.sh b/contrib/dev/vagrant/bootstrap.sh index 9bc1fb627..a142fb874 100644 --- a/contrib/dev/vagrant/bootstrap.sh +++ b/contrib/dev/vagrant/bootstrap.sh @@ -117,7 +117,7 @@ EOF echo "deb https://apt.dockerproject.org/repo ubuntu-wily main" > /etc/apt/sources.list.d/docker.list apt-get update apt-get -y install docker-engine - sed -i -r "s,(ExecStart)=(.+),\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service + sed -i -r "s|(ExecStart)=(.+)|\1=/usr/bin/docker daemon --insecure-registry ${REGISTRY} --registry-mirror=http://${REGISTRY}|" /lib/systemd/system/docker.service else echo "Unsupported Distro: $DISTRO" 1>&2 exit 1 diff --git a/contrib/template-override/opendaylight-template-overrides.j2 b/contrib/template-override/opendaylight-template-overrides.j2 new file mode 100644 index 000000000..e9f6cf38e --- /dev/null +++ b/contrib/template-override/opendaylight-template-overrides.j2 @@ -0,0 +1,22 @@ +{% extends parent_template %} + +{% block neutron_server_footer %} +ADD plugins-archive / +RUN pip --no-cache-dir install /plugins/* +{% endblock %} + +{% block opendaylight_source_install %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set opendaylight_packages = ['java-1.8.0-openjdk'] %} + {% elif base_distro in ['ubuntu', 'debian'] %} + {% set opendaylight_packages = ['openjdk-8-jre'] %} + {% endif %} + +{{ macros.install_packages(opendaylight_packages | customizable("packages")) }} + + {% if opendaylight_distro is not defined %} + {% set opendaylight_distro = 'distribution-karaf-0.5.3-Boron-SR3' %} + {% endif %} +ADD opendaylight-archive /opendaylight +RUN ln -s /opendaylight/{{ opendaylight_distro }} /opt/opendaylight +{% endblock %} |