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/nova/nova-spicehtml5proxy | |
| parent | a728239f41a2f1bd9b42d635c596835c934a2698 (diff) | |
| parent | 623e54da372563d068f0edf979b04996d70b306c (diff) | |
| download | kolla-2d278ea347feb254232295b69a90955b588698c3.tar.gz kolla-2d278ea347feb254232295b69a90955b588698c3.zip | |
Merge "Alphabetize packages"
Diffstat (limited to 'docker/nova/nova-spicehtml5proxy')
| -rw-r--r-- | docker/nova/nova-spicehtml5proxy/Dockerfile.j2 | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 index edd014dfa..69a412a0a 100644 --- a/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 +++ b/docker/nova/nova-spicehtml5proxy/Dockerfile.j2 @@ -9,9 +9,9 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set nova_spicehtml5proxy_packages = [ + 'numpy', 'openstack-nova-spicehtml5proxy', - 'spice-html5', - 'numpy' + 'spice-html5' ] %} {% elif base_distro in ['ubuntu'] %} @@ -27,8 +27,8 @@ MAINTAINER {{ maintainer }} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set nova_spicehtml5proxy_packages = [ - 'spice-html5', - 'numpy' + 'numpy', + 'spice-html5' ] %} {% elif base_distro in ['ubuntu'] %} |