diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-15 10:44:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-15 10:44:43 +0000 |
| commit | c790fb6c6af3bd1ecac30732f05458e01b241dee (patch) | |
| tree | ace8277bdfd81adea112d17d0fb0b1e29a782c0a | |
| parent | 71918cca5e8908eb25f3fa66552ba282667b32bd (diff) | |
| parent | 615b7a27f53cb44e7089b286a9dc823c4b20d78f (diff) | |
| download | kolla-c790fb6c6af3bd1ecac30732f05458e01b241dee.tar.gz kolla-c790fb6c6af3bd1ecac30732f05458e01b241dee.zip | |
Merge "Port openvswitch to docker_templates"
8 files changed, 53 insertions, 0 deletions
diff --git a/docker_templates/openvswitch/ovs-base/Dockerfile.j2 b/docker_templates/openvswitch/ovs-base/Dockerfile.j2 new file mode 100644 index 000000000..e4da1ac49 --- /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 000000000..784e194ed --- /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 000000000..ee1e0112c --- /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 000000000..f9408f4d4 --- /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 000000000..43cecf0e1 --- /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 000000000..46269880d --- /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 000000000..de6ac4870 --- /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 000000000..6fe55d6da --- /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 |