diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-03-03 16:31:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-03-03 16:31:31 +0000 |
| commit | ea15697aa83a598acfa1952a3824c780d56d92dc (patch) | |
| tree | d8478411772e000ad3e6a0fd9313d30282d6d6d4 /docker | |
| parent | e235f6cc57427c390cee5fad677e0f22328f7422 (diff) | |
| parent | 930737efae151748546ac7c6cb2c4865e75a3a5d (diff) | |
| download | kolla-ea15697aa83a598acfa1952a3824c780d56d92dc.tar.gz kolla-ea15697aa83a598acfa1952a3824c780d56d92dc.zip | |
Merge "Libvirt needs openvswitch to connect br-int"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index db46bc7cf..f9f465f16 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -9,6 +9,7 @@ RUN yum -y install \ python-keystoneclient \ python-cinderclient \ bridge-utils \ + openvswitch \ && yum clean all {% elif base_distro in ['ubuntu'] %} @@ -17,6 +18,7 @@ RUN apt-get install -y --no-install-recommends \ nova-common \ python-nova \ bridge-utils \ + openvswitch-switch \ && apt-get clean {% endif %} @@ -24,6 +26,7 @@ RUN apt-get install -y --no-install-recommends \ {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} RUN yum -y install bridge-utils \ + openvswitch \ && yum clean all {% elif base_distro in ['ubuntu', 'debian'] %} |