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
This commit is contained in:
@@ -19,7 +19,6 @@ class nova::params {
|
|||||||
$libvirt_daemon_package_prefix = 'libvirt-daemon-'
|
$libvirt_daemon_package_prefix = 'libvirt-daemon-'
|
||||||
$libvirt_nwfilter_package_name = 'libvirt-daemon-config-nwfilter'
|
$libvirt_nwfilter_package_name = 'libvirt-daemon-config-nwfilter'
|
||||||
$network_package_name = 'openstack-nova-network'
|
$network_package_name = 'openstack-nova-network'
|
||||||
$numpy_package_name = 'numpy'
|
|
||||||
$objectstore_package_name = 'openstack-nova-objectstore'
|
$objectstore_package_name = 'openstack-nova-objectstore'
|
||||||
$scheduler_package_name = 'openstack-nova-scheduler'
|
$scheduler_package_name = 'openstack-nova-scheduler'
|
||||||
$tgt_package_name = 'scsi-target-utils'
|
$tgt_package_name = 'scsi-target-utils'
|
||||||
@@ -84,7 +83,6 @@ class nova::params {
|
|||||||
$doc_package_name = 'nova-doc'
|
$doc_package_name = 'nova-doc'
|
||||||
$libvirt_package_name = 'libvirt-bin'
|
$libvirt_package_name = 'libvirt-bin'
|
||||||
$network_package_name = 'nova-network'
|
$network_package_name = 'nova-network'
|
||||||
$numpy_package_name = 'python-numpy'
|
|
||||||
$objectstore_package_name = 'nova-objectstore'
|
$objectstore_package_name = 'nova-objectstore'
|
||||||
$scheduler_package_name = 'nova-scheduler'
|
$scheduler_package_name = 'nova-scheduler'
|
||||||
$tgt_package_name = 'tgt'
|
$tgt_package_name = 'tgt'
|
||||||
|
@@ -55,20 +55,12 @@ class nova::vncproxy(
|
|||||||
|
|
||||||
include ::nova::vncproxy::common
|
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':
|
nova::generic_service { 'vncproxy':
|
||||||
enabled => $enabled,
|
enabled => $enabled,
|
||||||
manage_service => $manage_service,
|
manage_service => $manage_service,
|
||||||
package_name => $::nova::params::vncproxy_package_name,
|
package_name => $::nova::params::vncproxy_package_name,
|
||||||
service_name => $::nova::params::vncproxy_service_name,
|
service_name => $::nova::params::vncproxy_service_name,
|
||||||
ensure_package => $ensure_package,
|
ensure_package => $ensure_package,
|
||||||
require => Package['python-numpy']
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
@@ -0,0 +1,4 @@
|
|||||||
|
---
|
||||||
|
other:
|
||||||
|
- Stop installing python-numpy for vncproxy. In the context of noVNC,
|
||||||
|
numpy adds little performance according to websockify maintainer.
|
@@ -13,11 +13,6 @@ describe 'nova::vncproxy' do
|
|||||||
@default_facts.merge({ :osfamily => 'Debian' })
|
@default_facts.merge({ :osfamily => 'Debian' })
|
||||||
end
|
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_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_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') }
|
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' })
|
@default_facts.merge({ :osfamily => 'Redhat' })
|
||||||
end
|
end
|
||||||
|
|
||||||
it { is_expected.to contain_package('python-numpy').with(
|
|
||||||
:name => 'numpy',
|
|
||||||
:ensure => 'present'
|
|
||||||
)}
|
|
||||||
|
|
||||||
it { is_expected.to compile.with_all_deps }
|
it { is_expected.to compile.with_all_deps }
|
||||||
|
|
||||||
end
|
end
|
||||||
|
Reference in New Issue
Block a user