diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-16 07:08:31 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-16 07:08:31 +0000 |
| commit | ba07ec46bb8a96174ab4190c4d59214657cf52e7 (patch) | |
| tree | 52804a9bb4b2b1fbc9ddb594effb9331a1a37b17 | |
| parent | 9bd3ea7207c08971bc604b2d1a99bfa431780c02 (diff) | |
| download | kolla-ba07ec46bb8a96174ab4190c4d59214657cf52e7.tar.gz kolla-ba07ec46bb8a96174ab4190c4d59214657cf52e7.zip | |
Fix openvswitch template
Change-Id: I8e43285f620df4ea74ee78e637cd3eadc9adf5fd
Partially-Implements: blueprint dockerfile-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/ |