diff options
| author | Chao Guo <guochao@winhong.com> | 2016-11-28 19:31:29 +0800 |
|---|---|---|
| committer | Chao Guo <guochao@winhong.com> | 2016-11-28 19:39:32 +0800 |
| commit | 89dd91d7bb49e528d931ac0b0b70563eace94538 (patch) | |
| tree | b648db38f0d731bd51d06f12bb19434b00eb8b19 | |
| parent | 6e4586b6ea9a60fd4ccc0be236db8c3b12989939 (diff) | |
| download | kolla-89dd91d7bb49e528d931ac0b0b70563eace94538.tar.gz kolla-89dd91d7bb49e528d931ac0b0b70563eace94538.zip | |
Add strongswan to neutron-vpn-agent source image
Add strongswan/openswan package to vpn-agent source image
Lacking of strongswan/openswan package make it impossible
to use create vpn connections on images built from source.
Adding strongswan/openswan package fixes this bug.
Closes-Bug: #1644159
Change-Id: Id08e60c7132dd4e8723e588dc1dab20cfc541722
| -rw-r--r-- | docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 index 32bc1508b..1ea7fd9ba 100644 --- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 @@ -22,6 +22,18 @@ MAINTAINER {{ maintainer }} {% elif install_type == 'source' %} + {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} + {% set neutron_vpnaas_agent_packages = [ + 'openswan' + ] %} + {% elif base_distro in ['ubuntu', 'debian'] %} + {% set neutron_vpnaas_agent_packages = [ + 'strongswan' + ] %} + {% endif %} + +{{ macros.install_packages(neutron_vpnaas_agent_packages | customizable("packages")) }} + ADD neutron-vpnaas-agent-archive /neutron-vpnaas-agent-source RUN ln -s neutron-vpnaas-agent-source/* neutron_vpnaas \ && /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /neutron_vpnaas \ |