diff options
| author | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-14 16:29:10 +0300 |
|---|---|---|
| committer | Vladislav Belogrudov <vladislav.belogrudov@oracle.com> | 2015-09-14 17:58:59 +0300 |
| commit | 13d4df321a96dbac64c18e8a8b3def7ab2d017c9 (patch) | |
| tree | f809e9161fa0c986fa36d9d3198e12af15002205 /docker | |
| parent | 946554cfe58067c4a2ad88fdb96db18a50b3eb7c (diff) | |
| download | kolla-13d4df321a96dbac64c18e8a8b3def7ab2d017c9.tar.gz kolla-13d4df321a96dbac64c18e8a8b3def7ab2d017c9.zip | |
Source type nova-compute and neutron-agents - no ovs-vsctl
When booting a vm with centos-source nova-compute and
some of neutron-agents fails to find ovs-vsctl binary
Change-Id: If1e7b6513babd5623666f01c68815ea8d0a05428
Closes-Bug: #1495470
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 6 | ||||
| -rw-r--r-- | docker/nova/nova-compute/Dockerfile.j2 | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index e9a6ffb11..01eb3fef1 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -20,7 +20,11 @@ RUN echo '{{ install_type}} not yet available for {{ base_distro }}' \ {% endif %} {% elif install_type == 'source' %} - {% if base_distro in ['ubuntu', 'debian'] %} + {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + +RUN yum -y install openvswitch + + {% elif base_distro in ['ubuntu', 'debian'] %} RUN apt-get install -y --no-install-recommends \ iptables \ diff --git a/docker/nova/nova-compute/Dockerfile.j2 b/docker/nova/nova-compute/Dockerfile.j2 index 2fc9547a7..e10b05129 100644 --- a/docker/nova/nova-compute/Dockerfile.j2 +++ b/docker/nova/nova-compute/Dockerfile.j2 @@ -15,6 +15,7 @@ RUN yum -y install openstack-nova-compute \ RUN yum -y install \ libvirt-python \ + openvswitch \ qemu-img \ sysfsutils \ && yum clean all |