openstack
/
kolla
Code Issues Proposed changes

HA router fails using neutron-vpn-agent 

Creating a HA Router on kolla newton using the neutron-vpn-agent
instead neutron-l3-agent fails because keepalived is missing in the
neutron-vpn-agent container image.

Change-Id: If64040a5c59a2f0778769473a590109a69fc10a8
Closes-Bug: #1650534
Signed-off-by: Özgür Caner <oc@teuto.net>
(cherry picked from commit d46e9a2028)
This commit is contained in:
Özgür Caner 2016-12-16 14:19:54 +01:00
parent 11bfd9eb75
commit 54aa672ce5
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/neutron/neutron-base/Dockerfile.j2
View File

@ -9,6 +9,7 @@ MAINTAINER {{ maintainer }}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
{% set neutron_base_packages = [
'keepalived',
'openstack-neutron',
'openstack-neutron-lbaas',
'openstack-neutron-ml2',
@ -20,6 +21,7 @@ MAINTAINER {{ maintainer }}
{% set neutron_base_packages = [
'iproute2',
'keepalived',
'neutron-plugin-ml2',
'neutron-server',
'openvswitch-switch',
@ -46,6 +48,7 @@ RUN mkdir -p /usr/share/neutron \
'dnsmasq',
'dnsmasq-utils',
'ipset',
'keepalived',
'openvswitch',
'python-openvswitch',
'uuid'
@ -61,6 +64,7 @@ RUN mkdir -p /usr/share/neutron \
'ipset',
'iptables',
'iputils-arping',
'keepalived',
'openvswitch-switch',
'python-openvswitch',
'uuid-runtime'

7
docker/neutron/neutron-l3-agent/Dockerfile.j2
View File

@ -13,13 +13,6 @@ MAINTAINER {{ maintainer }}
] %}
{% endif %}
{% elif install_type == 'source' %}
{% set neutron_l3_agent_packages = [
'keepalived'
] %}
{% endif %}
{{ macros.install_packages(neutron_l3_agent_packages | customizable("packages")) }}