diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-14 23:43:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-14 23:43:35 +0000 |
| commit | 302b0302166ddfec43608e34bbcfaff6ce0c4545 (patch) | |
| tree | daecb92e797ce8f134047a6a4ff813dfd3d75205 /docker | |
| parent | 4d89dd4e5c15b4071522665fee8d4ff00ce1c20a (diff) | |
| parent | a9edc7e0a0a6f31a3648c78d9d1ebaf38f1c60c2 (diff) | |
| download | kolla-302b0302166ddfec43608e34bbcfaff6ce0c4545.tar.gz kolla-302b0302166ddfec43608e34bbcfaff6ce0c4545.zip | |
Merge "Install openvswitch-switch in manila"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/manila/manila-base/Dockerfile.j2 | 23 |
1 files changed, 22 insertions, 1 deletions
diff --git a/docker/manila/manila-base/Dockerfile.j2 b/docker/manila/manila-base/Dockerfile.j2 index ef6c2e833..83069c1f3 100644 --- a/docker/manila/manila-base/Dockerfile.j2 +++ b/docker/manila/manila-base/Dockerfile.j2 @@ -4,11 +4,32 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} -RUN yum -y install openstack-manila \ +RUN yum -y install \ + openstack-manila \ + openvswitch \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + openvswitch-switch \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install \ + openvswitch \ + && yum clean all + + {% elif base_distro in ['ubuntu', 'debian'] %} + +RUN apt-get install -y --no-install-recommends \ + openvswitch-switch \ + && apt-get clean + + {% endif %} ADD manila-base-archive /manila-base-source RUN ln -s manila-base-source/* manila \ |