From 5a6874c0ec103ee580c2f8bfb7b35c1f6fd7d99f Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 11 Dec 2020 21:40:43 +0530 Subject: [PATCH] Move pci class invocation to before nova::compute [1] handled it for nova::pci, issue with nova::compute::pci appeared post [2], this patch is moving nova:compute:pci class invocation to before nova::compute in order to handle the duplicate declaration. [1] https://review.opendev.org/c/x/packstack/+/762100 [2] https://review.opendev.org/c/openstack/puppet-nova/+/764352 Change-Id: I618aa1fb568a296558bd8a888bb9ae201c24ea76 --- .../puppet/modules/packstack/manifests/nova/compute.pp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packstack/puppet/modules/packstack/manifests/nova/compute.pp b/packstack/puppet/modules/packstack/manifests/nova/compute.pp index 19b921306..71a6119bc 100644 --- a/packstack/puppet/modules/packstack/manifests/nova/compute.pp +++ b/packstack/puppet/modules/packstack/manifests/nova/compute.pp @@ -73,6 +73,10 @@ class packstack::nova::compute () $instance_usage_audit_period = 'month' } + class { '::nova::compute::pci': + passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST') + } + class { '::nova::compute': enabled => true, vncproxy_host => hiera('CONFIG_KEYSTONE_HOST_URL'), @@ -90,10 +94,6 @@ class packstack::nova::compute () region_name => hiera('CONFIG_KEYSTONE_REGION'), } - class { '::nova::compute::pci': - passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST') - } - # Tune the host with a virtual hosts profile ensure_packages(['tuned'], {'ensure' => 'present'})