Merge "Provision building netcontrold container"

4 files changed, 49 insertions, 0 deletions

diff --git a/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2 b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2
new file mode 100644
index 000000000..197c46a9e
--- /dev/null
+++ b/docker/openvswitch/openvswitch-netcontrold/Dockerfile.j2
@@ -0,0 +1,38 @@
+FROM {{ namespace }}/{{ image_prefix }}openvswitch-base:{{ tag }}
+LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}"
+
+{% block openvswitch_netcontrold_header %}{% endblock %}
+
+{% import "macros.j2" as macros with context %}
+
+{% if install_type == 'binary' %}
+
+RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
+    && /bin/false
+
+{% elif install_type == 'source' %}
+
+{% block openvswitch_netcontrold_install %}
+
+{% set openvswitch_netcontrold_packages = [
+        'python3-pip',
+    ] %}
+
+{{ macros.install_packages(openvswitch_netcontrold_packages | customizable("packages")) }}
+
+{% set openvswitch_netcontrold_pip_packages = [
+    'netcontrold',
+  ]
+%}
+
+RUN {{ macros.install_pip(openvswitch_netcontrold_pip_packages | customizable("pip_packages"), constraints = false, pip_version = "pip3") }}
+
+{% endblock %}
+
+{% endif %}
+
+COPY extend_start.sh /usr/local/bin/kolla_openvswitch_extend_start
+RUN chmod 755 /usr/local/bin/kolla_openvswitch_extend_start
+
+{% block openvswitch_netcontrold_footer %}{% endblock %}
+{% block footer %}{% endblock %}
diff --git a/docker/openvswitch/openvswitch-netcontrold/extend_start.sh b/docker/openvswitch/openvswitch-netcontrold/extend_start.sh
new file mode 100644
index 000000000..716cb126c
--- /dev/null
+++ b/docker/openvswitch/openvswitch-netcontrold/extend_start.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+if [[ ! -d "/var/log/kolla/openvswitch/netcontrold" ]]; then
+    mkdir -p /var/log/kolla/openvswitch/netcontrold
+fi
+if [[ $(stat -c %a /var/log/kolla/openvswitch/netcontrold) != "755" ]]; then
+    chmod 755 /var/log/kolla/openvswitch/netcontrold
+fi
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 6a4602282..9108fe5e4 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -119,6 +119,7 @@ UNBUILDABLE_IMAGES = {
         "monasca-base",
         "monasca-thresh",
         "nova-mksproxy",
+        "openvswitch-netcontrold",
         "qinling-base",
         "searchlight-base",
         "solum-base",
diff --git a/releasenotes/notes/netcontrold-24c9d6602f84e819.yaml b/releasenotes/notes/netcontrold-24c9d6602f84e819.yaml
new file mode 100644
index 000000000..a4f9e6b6b
--- /dev/null
+++ b/releasenotes/notes/netcontrold-24c9d6602f84e819.yaml
@@ -0,0 +1,3 @@
+---
+features:
+    - Adds possibility to run netcontrold image for openvswitch service.