openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix openvswitch template"

Browse Source
This commit is contained in:
Jenkins 2015-08-17 15:00:42 +00:00 committed by Gerrit Code Review
commit 457854102e
2 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docker_templates/openvswitch/ovs-db-server/Dockerfile.j2
View File

@ -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/

12
docker_templates/openvswitch/ovs-vswitchd/Dockerfile.j2
View File

@ -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/