diff options
| author | Numan Siddique <nusiddiq@redhat.com> | 2017-04-20 21:32:57 +0530 |
|---|---|---|
| committer | Numan Siddique <nusiddiq@redhat.com> | 2017-06-02 17:47:10 +0530 |
| commit | 367a03284aa75df910872ea41ddf9a2ba0f69eed (patch) | |
| tree | 4df1d244a7d07855574e114c6f8d5183672fdd70 /docker/ovn/ovn-base | |
| parent | 43048c5be93dafb2d3ffa7943d504774cf92f123 (diff) | |
| download | kolla-367a03284aa75df910872ea41ddf9a2ba0f69eed.tar.gz kolla-367a03284aa75df910872ea41ddf9a2ba0f69eed.zip | |
Support OVN docker images
This patch adds kolla images for
- ovn-northd
- ovn-controller
- ovsdb-server for Northbound DB
- ovsdb-server for Southbound DB
Change-Id: I97f82395cb14108bdff57543e4847a5ece17fe69
Implements: blueprint ovn-controller-neutron
Signed-off-by: Numan Siddique <nusiddiq@redhat.com>
Diffstat (limited to 'docker/ovn/ovn-base')
| -rw-r--r-- | docker/ovn/ovn-base/Dockerfile.j2 | 26 | ||||
| -rw-r--r-- | docker/ovn/ovn-base/extend_start.sh | 10 |
2 files changed, 36 insertions, 0 deletions
diff --git a/docker/ovn/ovn-base/Dockerfile.j2 b/docker/ovn/ovn-base/Dockerfile.j2 new file mode 100644 index 000000000..cb095d66b --- /dev/null +++ b/docker/ovn/ovn-base/Dockerfile.j2 @@ -0,0 +1,26 @@ +FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }} +LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" + +{% block ovn_base_header %}{% endblock %} + +{% import "macros.j2" as macros with context %} + +{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set ovn_base_packages = [ + 'openvswitch-ovn-common', + ] %} + +{% elif base_distro in ['debian', 'ubuntu'] %} + {% set ovn_base_packages = [ + 'ovn-common', + ] %} + +{% endif %} +{{ macros.install_packages(ovn_base_packages | customizable("packages")) }} + +COPY extend_start.sh /usr/local/bin/kolla_extend_start + +RUN touch /usr/local/bin/kolla_ovn_extend_start \ + && chmod 755 /usr/local/bin/kolla_extend_start /usr/local/bin/kolla_ovn_extend_start + +{% block ovn_base_footer %}{% endblock %} diff --git a/docker/ovn/ovn-base/extend_start.sh b/docker/ovn/ovn-base/extend_start.sh new file mode 100644 index 000000000..089c8f6ae --- /dev/null +++ b/docker/ovn/ovn-base/extend_start.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +if [[ ! -d "/var/log/kolla/openvswitch" ]]; then + mkdir -p /var/log/kolla/openvswitch +fi +if [[ $(stat -c %a /var/log/kolla/openvswitch) != "755" ]]; then + chmod 755 /var/log/kolla/openvswitch +fi + +. /usr/local/bin/kolla_ovn_extend_start |
