From 54bb11cde9b01ba7386f6b6c16540d7a9096a02b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mathieu=20Gagne=CC=81?= Date: Wed, 25 May 2016 19:45:08 -0400 Subject: [PATCH] Stop installing python-numpy for vncproxy In the context of noVNC, numpy adds little performance according to websockify maintainer: https://github.com/kanaka/websockify/issues/77 Change-Id: If35f10db90605ce3faa3555ac5689b631c9b51bf --- manifests/params.pp | 2 -- manifests/vncproxy.pp | 8 -------- .../notes/stop-installing-numpy-01d4f2256e822f1c.yaml | 4 ++++ spec/classes/nova_vnc_proxy_spec.rb | 10 ---------- 4 files changed, 4 insertions(+), 20 deletions(-) create mode 100644 releasenotes/notes/stop-installing-numpy-01d4f2256e822f1c.yaml diff --git a/manifests/params.pp b/manifests/params.pp index 7d0434ae7..30399abb7 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -19,7 +19,6 @@ class nova::params { $libvirt_daemon_package_prefix = 'libvirt-daemon-' $libvirt_nwfilter_package_name = 'libvirt-daemon-config-nwfilter' $network_package_name = 'openstack-nova-network' - $numpy_package_name = 'numpy' $objectstore_package_name = 'openstack-nova-objectstore' $scheduler_package_name = 'openstack-nova-scheduler' $tgt_package_name = 'scsi-target-utils' @@ -84,7 +83,6 @@ class nova::params { $doc_package_name = 'nova-doc' $libvirt_package_name = 'libvirt-bin' $network_package_name = 'nova-network' - $numpy_package_name = 'python-numpy' $objectstore_package_name = 'nova-objectstore' $scheduler_package_name = 'nova-scheduler' $tgt_package_name = 'tgt' diff --git a/manifests/vncproxy.pp b/manifests/vncproxy.pp index 616a890b0..096836da7 100644 --- a/manifests/vncproxy.pp +++ b/manifests/vncproxy.pp @@ -55,20 +55,12 @@ class nova::vncproxy( include ::nova::vncproxy::common - if ! defined(Package['python-numpy']) { - package { 'python-numpy': - ensure => present, - name => $::nova::params::numpy_package_name, - tag => ['openstack', 'nova-support-package'], - } - } nova::generic_service { 'vncproxy': enabled => $enabled, manage_service => $manage_service, package_name => $::nova::params::vncproxy_package_name, service_name => $::nova::params::vncproxy_service_name, ensure_package => $ensure_package, - require => Package['python-numpy'] } } diff --git a/releasenotes/notes/stop-installing-numpy-01d4f2256e822f1c.yaml b/releasenotes/notes/stop-installing-numpy-01d4f2256e822f1c.yaml new file mode 100644 index 000000000..ce50e1b5d --- /dev/null +++ b/releasenotes/notes/stop-installing-numpy-01d4f2256e822f1c.yaml @@ -0,0 +1,4 @@ +--- +other: + - Stop installing python-numpy for vncproxy. In the context of noVNC, + numpy adds little performance according to websockify maintainer. diff --git a/spec/classes/nova_vnc_proxy_spec.rb b/spec/classes/nova_vnc_proxy_spec.rb index 0bbb5f8df..c8fc71148 100644 --- a/spec/classes/nova_vnc_proxy_spec.rb +++ b/spec/classes/nova_vnc_proxy_spec.rb @@ -13,11 +13,6 @@ describe 'nova::vncproxy' do @default_facts.merge({ :osfamily => 'Debian' }) end - it { is_expected.to contain_package('python-numpy').with( - :ensure => 'present', - :name => 'python-numpy' - )} - it { is_expected.to contain_nova_config('vnc/novncproxy_host').with(:value => '0.0.0.0') } it { is_expected.to contain_nova_config('vnc/novncproxy_port').with(:value => '6080') } it { is_expected.to contain_nova_config('vnc/novncproxy_base_url').with(:value => 'http://0.0.0.0:6080/vnc_auto.html') } @@ -96,11 +91,6 @@ describe 'nova::vncproxy' do @default_facts.merge({ :osfamily => 'Redhat' }) end - it { is_expected.to contain_package('python-numpy').with( - :name => 'numpy', - :ensure => 'present' - )} - it { is_expected.to compile.with_all_deps } end