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/q/I5b3d9dbbd41d060134444609458b3e8bba606ae6
Change-Id: I618aa1fb568a296558bd8a888bb9ae201c24ea76
(cherry picked from commit 5a6874c0ec
)
This commit is contained in:
parent
2c1dd04609
commit
3f07038a42
|
@ -73,6 +73,10 @@ class packstack::nova::compute ()
|
||||||
$instance_usage_audit_period = 'month'
|
$instance_usage_audit_period = 'month'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class { '::nova::compute::pci':
|
||||||
|
passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST')
|
||||||
|
}
|
||||||
|
|
||||||
class { '::nova::compute':
|
class { '::nova::compute':
|
||||||
enabled => true,
|
enabled => true,
|
||||||
vncproxy_host => hiera('CONFIG_KEYSTONE_HOST_URL'),
|
vncproxy_host => hiera('CONFIG_KEYSTONE_HOST_URL'),
|
||||||
|
@ -90,10 +94,6 @@ class packstack::nova::compute ()
|
||||||
region_name => hiera('CONFIG_KEYSTONE_REGION'),
|
region_name => hiera('CONFIG_KEYSTONE_REGION'),
|
||||||
}
|
}
|
||||||
|
|
||||||
class { '::nova::compute::pci':
|
|
||||||
passthrough => hiera('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST')
|
|
||||||
}
|
|
||||||
|
|
||||||
include ::nova::cell_v2::discover_hosts
|
include ::nova::cell_v2::discover_hosts
|
||||||
|
|
||||||
Class['nova::compute'] ~> Class['nova::cell_v2::discover_hosts']
|
Class['nova::compute'] ~> Class['nova::cell_v2::discover_hosts']
|
||||||
|
|
Loading…
Reference in New Issue