diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch b/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch new file mode 100644 index 000000000..a1e68114a --- /dev/null +++ b/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/0010-Remove-compute-huge.patch @@ -0,0 +1,32 @@ +From 1028b39c2fd611b5ba8fea78b03763e4836c4a2c Mon Sep 17 00:00:00 2001 +From: Tao Liu +Date: Sat, 12 May 2018 16:48:31 -0500 +Subject: [PATCH 1/1] US112325 Compute-huge replacement + +--- + SPECS/puppet-nova.spec | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/SPECS/puppet-nova.spec b/SPECS/puppet-nova.spec +index dea8857..c40ec94 100644 +--- a/SPECS/puppet-nova.spec ++++ b/SPECS/puppet-nova.spec +@@ -18,6 +18,7 @@ Patch0006: 0006-Create-Nova-ironic-conf.patch + Patch0007: 0007-Remove-joshuabaird-ipaclient-from-puppet-nova-requir.patch + Patch0008: 0008-Adding-pci_weight_multiple-to-nova-scheduler-filter.patch + Patch0009: 0009-Remove-SerialConsole-from-NovaConf.patch ++Patch0010: 0010-Remove-compute-huge.patch + + BuildArch: noarch + +@@ -47,6 +48,7 @@ Puppet module for OpenStack Nova + %patch0007 -p1 + %patch0008 -p1 + %patch0009 -p1 ++%patch0010 -p1 + + find . -type f -name ".*" -exec rm {} + + find . -size 0 -exec rm {} + +-- +1.8.3.1 + diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER b/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER index ff285a5f6..3b1dea7b1 100644 --- a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER +++ b/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/meta_patches/PATCH_ORDER @@ -7,3 +7,4 @@ 0007-remove-joshuabaird-ipaclient-requirement.patch 0008-Add-pci_weight_multiple-to-scheduler-filter.patch 0009-Remove-SerialConsole-from-NovaConf.patch +0010-Remove-compute-huge.patch diff --git a/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch b/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch new file mode 100644 index 000000000..77179f5d0 --- /dev/null +++ b/devtools/puppet-modules/openstack/puppet-nova-11.4.0/centos/patches/0010-Remove-compute-huge.patch @@ -0,0 +1,29 @@ +From 14d20a344d2918d1225b04397a374eb6795faebe Mon Sep 17 00:00:00 2001 +From: Tao Liu +Date: Sat, 12 May 2018 16:42:15 -0500 +Subject: [PATCH 1/1] US112325 Compute-huge replacement + +--- + manifests/compute.pp | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/manifests/compute.pp b/manifests/compute.pp +index 36d2e7a..719729a 100644 +--- a/manifests/compute.pp ++++ b/manifests/compute.pp +@@ -266,12 +266,6 @@ class nova::compute ( + } + } + +- Compute_reserved_config<||> ~> +- exec { 'compute-huge reload': +- path => [ '/usr/bin', '/usr/sbin', '/bin', '/sbin' ], +- command => '/etc/init.d/compute-huge.sh reload', +- } +- + ensure_resource('nova_config', 'DEFAULT/allow_resize_to_same_host', { value => $allow_resize_to_same_host }) + + if ($vnc_enabled) { +-- +1.8.3.1 +