diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-17 15:00:42 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-17 15:00:42 +0000 |
| commit | 457854102e49ef96744fe9ebdc807227d1a7462e (patch) | |
| tree | f6d4d443e60d06c3eeb831e35b4d951f4f386573 | |
| parent | dd942497f229227615db5edd30e99b974fc5f311 (diff) | |
| parent | ba07ec46bb8a96174ab4190c4d59214657cf52e7 (diff) | |
| download | kolla-457854102e49ef96744fe9ebdc807227d1a7462e.tar.gz kolla-457854102e49ef96744fe9ebdc807227d1a7462e.zip | |
Merge "Fix openvswitch template"
| -rw-r--r-- | docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 | 12 | ||||
| -rw-r--r-- | docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 | 12 |
2 files changed, 2 insertions, 22 deletions
diff --git a/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 b/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 index 784e194ed..3d80329c3 100644 --- a/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 +++ b/docker_templates/openvswitch/ovs-db-server/Dockerfile.j2 @@ -1,16 +1,6 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-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/ diff --git a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 b/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 index 43cecf0e1..727104405 100644 --- a/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 +++ b/docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2 @@ -1,16 +1,6 @@ -FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-base:{{ tag }} +FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-ovs-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/ |