diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-04-03 16:17:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-04-03 16:17:58 +0000 |
| commit | 2d278ea347feb254232295b69a90955b588698c3 (patch) | |
| tree | f42d3dcc6f66af30f7501fac8b07d28b4301008c /docker/neutron | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/neutron')
| -rw-r--r-- | docker/neutron/neutron-base/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/docker/neutron/neutron-base/Dockerfile.j2 b/docker/neutron/neutron-base/Dockerfile.j2 index 1193c91c1..41426fe76 100644 --- a/docker/neutron/neutron-base/Dockerfile.j2 +++ b/docker/neutron/neutron-base/Dockerfile.j2 @@ -28,10 +28,10 @@ MAINTAINER {{ maintainer }} {% set neutron_base_packages = [ 'iproute2', 'keepalived', + 'neutron-lbaas-common', 'neutron-plugin-ml2', 'neutron-server', 'openvswitch-switch', - 'neutron-lbaas-common', 'python-openvswitch' ] %} diff --git a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 index fadfa2ca0..0a0241a47 100644 --- a/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 +++ b/docker/neutron/neutron-vpnaas-agent/Dockerfile.j2 @@ -8,13 +8,13 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set neutron_vpnaas_agent_packages = [ - 'openswan', - 'openstack-neutron-vpn-agent' + 'openstack-neutron-vpn-agent', + 'openswan' ] %} {% elif base_distro in ['ubuntu', 'debian'] %} {% set neutron_vpnaas_agent_packages = [ - 'strongswan', - 'neutron-vpn-agent' + 'neutron-vpn-agent', + 'strongswan' ] %} {% endif %} |
