openstack/kolla-ansible
Code Issues Proposed changes

Port openvswitch to docker_templates

Browse Source 
This makes openvswitch build with build.py --templates.  The three
containers built by this work are ovs-base, ovs-db-server, and
ovs-vswitchd.

Partially Implements: blueprint dockerfile-template

Change-Id: If2e420d561a50cd5e1c7ba5eaa81c96526f7a1ac
This commit is contained in:
Robyn Bergeron 2015-08-14 09:32:17 -07:00
parent df54c15145
commit 615b7a27f5
8 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker_templates/openvswitch/ovs-base/Dockerfile.j2 Normal file
View File

@ -0,0 +1,14 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if base_distro in ['fedora', 'centos', 'oraclelinux'] %}
RUN yum install -y openvswitch \
&& yum clean all
{% elif base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}

17
docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 Normal file
View File

@ -0,0 +1,17 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO (rbergero): When ovs support is added for ubuntu/debian, this
# conditional should be removed.
{% if base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
COPY start.sh /
COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]

1
docker_templates/openvswitch/ovs-db-server/config-external.sh Symbolic link
View File

@ -0,0 +1 @@
../../../docker/common/openvswitch/ovs-db-server/config-external.sh

1
docker_templates/openvswitch/ovs-db-server/start.sh Symbolic link
View File

@ -0,0 +1 @@
../../../docker/common/openvswitch/ovs-db-server/start.sh

17
docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 Normal file
View File

@ -0,0 +1,17 @@
FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }}
MAINTAINER Kolla Project (https://launchpad.net/kolla)
# TODO (rbergero): When ovs support is added for ubuntu/debian, this
# conditional should be removed.
{% if base_distro in ['ubuntu', 'debian'] %}
RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
&& /bin/false
{% endif %}
COPY start.sh /
COPY ovs_ensure_configured.sh config-external.sh /opt/kolla/
CMD ["/start.sh"]

1
docker_templates/openvswitch/ovs-vswitchd/config-external.sh Symbolic link
View File

@ -0,0 +1 @@
../../../docker/common/openvswitch/ovs-vswitchd/config-external.sh

1
docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh Symbolic link
View File

@ -0,0 +1 @@
../../../docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh

1
docker_templates/openvswitch/ovs-vswitchd/start.sh Symbolic link
View File

@ -0,0 +1 @@
../../../docker/common/openvswitch/ovs-vswitchd/start.sh