diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-12-31 15:22:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-12-31 15:22:25 +0000 |
| commit | 28ef995398f8ec8f0b29bc8edf8fc240a46a91d5 (patch) | |
| tree | 6497e56b5fd42288ede4ca85a2c9046f92acd605 | |
| parent | f38f9faf0d99790388153916e36fc55563590ec6 (diff) | |
| parent | 0ce55a9eddeab8261a7595e1c9ad6b1f35056bd2 (diff) | |
| download | kolla-28ef995398f8ec8f0b29bc8edf8fc240a46a91d5.tar.gz kolla-28ef995398f8ec8f0b29bc8edf8fc240a46a91d5.zip | |
Merge "Neutron ubuntu binary container"
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 9 | ||||
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 10 | ||||
| -rw-r--r-- | docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 | 7 | ||||
| -rw-r--r-- | docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 | 8 |
4 files changed, 34 insertions, 0 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 65ba46c8d..a48ceb7b6 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -17,6 +17,15 @@ RUN apt-get install -y --no-install-recommends supervisor \ COPY supervisord.conf /etc/supervisor/ + {% if install_type == 'binary' %} + +RUN apt-get install -y --no-install-recommends \ + neutron-metadata-agent \ + neutron-dhcp-agent \ + neutron-l3-agent \ + && apt-get clean + + {% endif %} {% endif %} # TODO: SamYaple FWaaS is part of the l3-agent, not a seperate agent that is diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 2a4dad52b..99afbdaf8 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -13,6 +13,16 @@ RUN yum -y install \ # TODO (sdake): remove once RDO adds to the openstack-neutron package RUN pip install oslo.versionedobjects + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + neutron-plugin-ml2 \ + openvswitch-switch \ + neutron-server \ + && apt-get clean \ + && mkdir -p /usr/share/neutron \ + && ln -s /etc/neutron/api-paste.ini /usr/share/neutron/api-paste.ini + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 index f38999659..d28797293 100644 --- a/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-linuxbridge-agent/Dockerfile.j2 @@ -10,6 +10,13 @@ RUN yum install -y \ openstack-neutron-linuxbridge \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + ebtables \ + neutron-plugin-linuxbridge \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} diff --git a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 index eaf446af6..de075da25 100644 --- a/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-openvswitch-agent/Dockerfile.j2 @@ -10,6 +10,14 @@ RUN yum install -y \ openvswitch \ && yum clean all + {% elif base_distro in ['ubuntu'] %} + +RUN apt-get install -y --no-install-recommends \ + neutron-plugin-openvswitch \ + openvswitch-switch \ + neutron-plugin-openvswitch-agent \ + && apt-get clean + {% endif %} {% elif install_type == 'source' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} |