openstack/tripleo-heat-templates
Code Issues Proposed changes

Replace deprecated ironoc::inspector parameters in puppet-ironic

Browse Source 
Replace some parameters in puppet-ironic, which were deprecated in
recent refactoring[1].

[1] https://review.opendev.org/#/c/719454/

Change-Id: Ib7d22fee0219514aee7f8ef8798449b24c59f919
This commit is contained in:
Takashi Kajinami 2020-04-18 22:36:06 +09:00
parent 5b0d1434e9
commit b290995598
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
deployment/ironic/ironic-inspector-container-puppet.yaml
View File

@ -279,15 +279,16 @@ outputs:
ironic::inspector::cors::allow_methods: 'GET,POST,PUT,DELETE,OPTIONS,PATCH' ironic::inspector::cors::allow_methods: 'GET,POST,PUT,DELETE,OPTIONS,PATCH'
ironic::inspector::cors::allow_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma,X-Auth-Token' ironic::inspector::cors::allow_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma,X-Auth-Token'
ironic::inspector::cors::expose_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma' ironic::inspector::cors::expose_headers: 'Content-Type,Cache-Control,Content-Language,Expires,Last-Modified,Pragma'
ironic::inspector::ironic_username: 'ironic'
ironic::inspector::ironic_password: {get_param: IronicPassword}
ironic::inspector::ironic_tenant_name: 'service'
ironic::inspector::ironic_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::inspector::ipxe_timeout: 60 ironic::inspector::ipxe_timeout: 60
ironic::inspector::ironic_max_retries: 6 ironic::inspector::ironic::username: 'ironic'
ironic::inspector::ironic_retry_interval: 10 ironic::inspector::ironic::password: {get_param: IronicPassword}
ironic::inspector::ironic_user_domain_name: 'Default' ironic::inspector::ironic::project_name: 'service'
ironic::inspector::ironic_project_domain_name: 'Default' ironic::inspector::ironic::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::inspector::ironic::max_retries: 6
ironic::inspector::ironic::retry_interval: 10
ironic::inspector::ironic::user_domain_name: 'Default'
ironic::inspector::ironic::project_domain_name: 'Default'
ironic::inspector::ironic::region_name: {get_param: KeystoneRegion}
ironic::inspector::http_port: {get_param: IronicIPXEPort} ironic::inspector::http_port: {get_param: IronicIPXEPort}
ironic::inspector::additional_processing_hooks: {get_param: IronicInspectorExtraProcessingHooks} ironic::inspector::additional_processing_hooks: {get_param: IronicInspectorExtraProcessingHooks}
ironic::inspector::ramdisk_collectors: {get_param: IronicInspectorCollectors} ironic::inspector::ramdisk_collectors: {get_param: IronicInspectorCollectors}
@ -327,12 +328,13 @@ outputs:
if: if:
- use_swift - use_swift
- ironic::inspector::store_data: 'swift' - ironic::inspector::store_data: 'swift'
ironic::inspector::swift_username: 'ironic' ironic::inspector::swift::username: 'ironic'
ironic::inspector::swift_password: {get_param: IronicPassword} ironic::inspector::swift::password: {get_param: IronicPassword}
ironic::inspector::swift_tenant_name: 'service' ironic::inspector::swift::project_name: 'service'
ironic::inspector::swift_auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} ironic::inspector::swift::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
ironic::inspector::swift_user_domain_name: 'Default' ironic::inspector::swift::user_domain_name: 'Default'
ironic::inspector::swift_project_domain_name: 'Default' ironic::inspector::swift::project_domain_name: 'Default'
ironic::inspector::swift::region_name: {get_param: KeystoneRegion}
- {} - {}
- -
if: if: