[victoria/ussuri/train] Tune minion defaults
Undercloud Minion should be configured with the same default tuning as Undercloud[1] for heat & ironic. We have dropped minion environment files for wallaby+, Updating minion setting for t/u/v. Also, add minion job in zuul layout, As this isn't covered by the zuul project templates. In tripleo-ansible repo also minion job is also explicility mentioned[2] [1] https://github.com/openstack/tripleo-heat-templates/blob/stable/victoria/environments/undercloud.yaml#L96-L137 [2] https://github.com/openstack/tripleo-ansible/blob/stable/victoria/zuul.d/layout.yaml#L25-L45 Related-Bug: #1947510 Change-Id: I580cddf94a8da20081700c46526b21a8beb38210
This commit is contained in:
parent
8a4351664d
commit
72e0b6b78c
|
@ -16,6 +16,30 @@ parameter_defaults:
|
|||
# Type: boolean
|
||||
EnablePackageInstall: True
|
||||
|
||||
# Indicate whether this resource may be shared with the domain received in the request "origin" header.
|
||||
# Type: string
|
||||
HeatCorsAllowedOrigin: '*'
|
||||
|
||||
# Maximum number of nested stack depth.
|
||||
# Type: number
|
||||
HeatMaxNestedStackDepth: 7
|
||||
|
||||
# Maximum resources allowed per top-level stack. -1 stands for unlimited.
|
||||
# Type: number
|
||||
HeatMaxResourcesPerStack: -1
|
||||
|
||||
# Allow reauthentication on token expiry, such that long-running tasks may complete. Note this defeats the expiry of any provided user tokens.
|
||||
# Type: string
|
||||
HeatReauthenticationAuthMethod: 'trusts'
|
||||
|
||||
# The maximum number of elements in collection yaql expressions can take for its evaluation.
|
||||
# Type: number
|
||||
HeatYaqlLimitIterators: 10000
|
||||
|
||||
# The maximum size of memory in bytes that yaql exrpessions can take for its evaluation.
|
||||
# Type: number
|
||||
HeatYaqlMemoryQuota: 200000
|
||||
|
||||
# Type of disk cleaning before and between deployments, "full" for full cleaning, "metadata" to clean only disk metadata (partition table).
|
||||
# Type: string
|
||||
IronicCleaningDiskErase: metadata
|
||||
|
@ -28,6 +52,10 @@ parameter_defaults:
|
|||
# Type: string
|
||||
IronicDefaultInspectInterface: inspector
|
||||
|
||||
# Default resource class to use for new nodes.
|
||||
# Type: string
|
||||
IronicDefaultResourceClass: baremetal
|
||||
|
||||
# Whether to enable use of staging drivers.
|
||||
# Type: boolean
|
||||
IronicEnableStagingDrivers: True
|
||||
|
|
|
@ -9,6 +9,16 @@ environments:
|
|||
description: |
|
||||
TODO
|
||||
files:
|
||||
deployment/heat/heat-base-puppet.yaml:
|
||||
parameters:
|
||||
- HeatCorsAllowedOrigin
|
||||
- HeatYaqlLimitIterators
|
||||
- HeatYaqlMemoryQuota
|
||||
deployment/heat/heat-engine-container-puppet.yaml:
|
||||
parameters:
|
||||
- HeatMaxNestedStackDepth
|
||||
- HeatMaxResourcesPerStack
|
||||
- HeatReauthenticationAuthMethod
|
||||
deployment/timesync/chrony-baremetal-ansible.yaml:
|
||||
parameters:
|
||||
- NtpServer
|
||||
|
@ -29,6 +39,9 @@ environments:
|
|||
sample-env-generator/undercloud-minion.yaml:
|
||||
parameters:
|
||||
- UndercloudMinionNetworkConfigTemplate
|
||||
deployment/ironic/ironic-base-puppet.yaml:
|
||||
parameters:
|
||||
- IronicDefaultResourceClass
|
||||
deployment/ironic/ironic-conductor-container-puppet.yaml:
|
||||
parameters:
|
||||
- IronicCleaningDiskErase
|
||||
|
@ -52,6 +65,12 @@ environments:
|
|||
- IronicRescuingNetwork
|
||||
sample_values:
|
||||
# Normal bits for standalone
|
||||
HeatCorsAllowedOrigin: "'*'"
|
||||
HeatMaxNestedStackDepth: 7
|
||||
HeatMaxResourcesPerStack: -1
|
||||
HeatReauthenticationAuthMethod: "'trusts'"
|
||||
HeatYaqlLimitIterators: 10000
|
||||
HeatYaqlMemoryQuota: 200000
|
||||
StackAction: CREATE
|
||||
SoftwareConfigTransport: POLL_SERVER_HEAT
|
||||
EnablePackageInstall: true
|
||||
|
|
|
@ -17,12 +17,24 @@
|
|||
dependencies:
|
||||
- openstack-tox-pep8
|
||||
- openstack-tox-tht
|
||||
- tripleo-ci-centos-8-containers-undercloud-minion: &undercloud_minion
|
||||
vars:
|
||||
consumer_job: true
|
||||
remove_tags:
|
||||
- build
|
||||
dependencies:
|
||||
- tripleo-ci-centos-8-content-provider
|
||||
files:
|
||||
- ^sample-env-generator/undercloud-minion.yaml
|
||||
- ^environments/undercloud/undercloud-minion.yaml
|
||||
- ^deployment/undercloud/minion-rabbitmq-puppet.yaml
|
||||
|
||||
gate:
|
||||
queue: tripleo
|
||||
jobs:
|
||||
- openstack-tox-pep8
|
||||
- openstack-tox-tht
|
||||
- tripleo-ci-centos-8-containers-undercloud-minion: *undercloud_minion
|
||||
|
||||
- job:
|
||||
name: openstack-tox-tht
|
||||
|
|
Loading…
Reference in New Issue