diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 new file mode 100644 index 0000000000..e4da1ac490 --- /dev/null +++ b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 @@ -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 %} diff --git a/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 b/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 new file mode 100644 index 0000000000..784e194ed0 --- /dev/null +++ b/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 @@ -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"] diff --git a/docker_templates/openvswitch/ovs-db-server/config-external.sh b/docker_templates/openvswitch/ovs-db-server/config-external.sh new file mode 120000 index 0000000000..ee1e0112cc --- /dev/null +++ b/docker_templates/openvswitch/ovs-db-server/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/openvswitch/ovs-db-server/config-external.sh \ No newline at end of file diff --git a/docker_templates/openvswitch/ovs-db-server/start.sh b/docker_templates/openvswitch/ovs-db-server/start.sh new file mode 120000 index 0000000000..f9408f4d44 --- /dev/null +++ b/docker_templates/openvswitch/ovs-db-server/start.sh @@ -0,0 +1 @@ +../../../docker/common/openvswitch/ovs-db-server/start.sh \ No newline at end of file diff --git a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 new file mode 100644 index 0000000000..43cecf0e17 --- /dev/null +++ b/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 @@ -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"] diff --git a/docker_templates/openvswitch/ovs-vswitchd/config-external.sh b/docker_templates/openvswitch/ovs-vswitchd/config-external.sh new file mode 120000 index 0000000000..46269880d7 --- /dev/null +++ b/docker_templates/openvswitch/ovs-vswitchd/config-external.sh @@ -0,0 +1 @@ +../../../docker/common/openvswitch/ovs-vswitchd/config-external.sh \ No newline at end of file diff --git a/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh b/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh new file mode 120000 index 0000000000..de6ac48708 --- /dev/null +++ b/docker_templates/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh @@ -0,0 +1 @@ +../../../docker/common/openvswitch/ovs-vswitchd/ovs_ensure_configured.sh \ No newline at end of file diff --git a/docker_templates/openvswitch/ovs-vswitchd/start.sh b/docker_templates/openvswitch/ovs-vswitchd/start.sh new file mode 120000 index 0000000000..6fe55d6da7 --- /dev/null +++ b/docker_templates/openvswitch/ovs-vswitchd/start.sh @@ -0,0 +1 @@ +../../../docker/common/openvswitch/ovs-vswitchd/start.sh \ No newline at end of file