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
Also make multinode c7 job non voting to unblock c8 puppet
promotion, c7 phase 1 based promotion is too old so making
it non voting until it's cleared.
Change-Id: I618aa1fb568a296558bd8a888bb9ae201c24ea76
(cherry picked from commit 5a6874c0ec
)
This commit is contained in:
parent
ceead5c48e
commit
2b852c78f7
|
@ -228,7 +228,8 @@
|
||||||
- packstack-integration-scenario001-tempest
|
- packstack-integration-scenario001-tempest
|
||||||
- packstack-integration-scenario002-tempest
|
- packstack-integration-scenario002-tempest
|
||||||
- packstack-integration-scenario003-tempest
|
- packstack-integration-scenario003-tempest
|
||||||
- packstack-multinode-scenario002-tempest
|
- packstack-multinode-scenario002-tempest:
|
||||||
|
voting: false
|
||||||
# We can't make centos8 jobs voting until we have promotion pipeline
|
# We can't make centos8 jobs voting until we have promotion pipeline
|
||||||
- packstack-centos8-integration-scenario001:
|
- packstack-centos8-integration-scenario001:
|
||||||
voting: false
|
voting: false
|
||||||
|
@ -250,7 +251,6 @@
|
||||||
- packstack-integration-scenario001-tempest
|
- packstack-integration-scenario001-tempest
|
||||||
- packstack-integration-scenario002-tempest
|
- packstack-integration-scenario002-tempest
|
||||||
- packstack-integration-scenario003-tempest
|
- packstack-integration-scenario003-tempest
|
||||||
- packstack-multinode-scenario002-tempest
|
|
||||||
post:
|
post:
|
||||||
jobs:
|
jobs:
|
||||||
- packstack-upload-git-mirror
|
- packstack-upload-git-mirror
|
||||||
|
|
|
@ -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