Eliminate nova_novnc_distro_packages

The variable is useless and it only breaks things.  The js-jquery
packages don't even exist on RedHat.  All those dependencies are
pulled in and vendored in anyways, the Python ones are built, so
noVNC can run with no problem without any of those.

Change-Id: I59ad2014ed001a318ae4b865f0e218b6f8e18d92
This commit is contained in:
Mohammed Naser 2019-03-31 20:51:44 -04:00
parent 7c8b4f30f9
commit 83cd24912d
5 changed files with 0 additions and 25 deletions

View File

@ -24,7 +24,6 @@ nova_package_list: |-
nova_services['nova-spicehtml5proxy']['group'] in group_names or
nova_services['nova-serialconsole-proxy']['group'] in group_names %}
{% if nova_console_type == 'novnc' %}
{% set _ = packages.extend(nova_novnc_distro_packages) %}
{% set _ = packages.extend(nova_service_extra_distro_packages['novnc']) %}
{% endif %}
{% if nova_console_type == 'spice' %}

View File

@ -55,12 +55,6 @@ nova_service_extra_distro_packages:
serialconsole:
- openstack-nova-serialproxy
nova_novnc_distro_packages:
- js-jquery
- js-underscore
- librabbitmq
- libyaml
nova_compute_barbican_distro_packages:
- cryptsetup

View File

@ -20,13 +20,6 @@
#
nova_package_list: |-
{% set packages = nova_distro_packages %}
{% if nova_services['nova-novncproxy']['group'] in group_names or
nova_services['nova-spicehtml5proxy']['group'] in group_names or
nova_services['nova-serialconsole-proxy']['group'] in group_names %}
{% if nova_console_type == 'novnc' %}
{% set _ = packages.extend(nova_novnc_distro_packages) %}
{% endif %}
{% endif %}
{% if nova_services['nova-compute']['group'] in group_names %}
{% if nova_virt_type in ['kvm', 'qemu'] %}
{% set _ = packages.extend(nova_compute_kvm_distro_packages) %}

View File

@ -55,9 +55,6 @@ nova_service_extra_distro_packages:
serialconsole:
- openstack-nova-serialproxy
nova_novnc_distro_packages:
- python-websockify
nova_compute_barbican_distro_packages:
- cryptsetup

View File

@ -57,14 +57,6 @@ nova_service_extra_distro_packages:
serialconsole:
- openstack-nova-serialproxy
nova_novnc_distro_packages:
- libjs-jquery
- libjs-sphinxdoc
- libjs-underscore
- libjs-swfobject
- librabbitmq4
- libyaml-0-2
nova_compute_barbican_distro_packages:
- cryptsetup