openstack
/
puppet-ironic
Code Issues Proposed changes

Added 'ironic/ironic_url','swift/container' to manifests/inspector.pp 

Change-Id: I9e4517e1fd1f6247b0d570df06371125900f34d5
Signed-off-by: Zygimantas Matonis <zygimantas.matonis@cern.ch>
This commit is contained in:
Zygimantas Matonis 2019-10-22 13:34:47 +02:00
parent 6deffc3188
commit f8fa738c98
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
manifests/inspector.pp
View File

@ -231,10 +231,21 @@
#
# [*default_transport_url*]
# (optional) A URL representing the messaging driver to use and its full
# configuration. Transport URLs take the form:
# configuration. Transport URLs take the form:F
# transport://user:pass@host1:port[,hostN:portN]/virtual_host
# Defaults to 'fake://'
#
# [*ironic_url*]
# (optional) Ironic API URL, used to set Ironic API URL when auth_strategy
# option is noauth or auth_type is "none" to work with standalone Ironic
# without keystone. String value
# Defaults to 'undef'
#
# [*swift_container*]
# (optional) Default Swift container name to use when creating objects.
# String value
# Defaults to $::os_service_default
class ironic::inspector (
$package_ensure = 'present',
$enabled = true,
@ -257,6 +268,7 @@ class ironic::inspector (
$ironic_project_domain_name = 'Default',
$ironic_user_domain_name = 'Default',
$ironic_auth_url = 'http://127.0.0.1:5000/v3',
$ironic_url = undef,
$ironic_max_retries = 30,
$ironic_retry_interval = 2,
$swift_auth_type = 'password',
@ -266,6 +278,7 @@ class ironic::inspector (
$swift_project_domain_name = 'Default',
$swift_user_domain_name = 'Default',
$swift_auth_url = 'http://127.0.0.1:5000/v3',
$swift_container = $::os_service_default,
$dnsmasq_ip_subnets = [],
$dnsmasq_local_ip = '192.168.0.1',
$dnsmasq_dhcp_hostsdir = undef,
@ -382,6 +395,7 @@ class ironic::inspector (
'ironic/project_domain_name': value => $ironic_project_domain_name;
'ironic/user_domain_name': value => $ironic_user_domain_name;
'ironic/auth_url': value => $ironic_auth_url;
'ironic/ironic_url': value => $ironic_url;
'ironic/max_retries': value => $ironic_max_retries;
'ironic/retry_interval': value => $ironic_retry_interval;
'swift/auth_type': value => $swift_auth_type;
@ -391,6 +405,7 @@ class ironic::inspector (
'swift/project_domain_name': value => $swift_project_domain_name;
'swift/user_domain_name': value => $swift_user_domain_name;
'swift/auth_url': value => $swift_auth_url;
'swift/container': value => $swift_container;
# Here we use oslo.config interpolation with another option default_processing_hooks,
# which we don't change as it might break introspection completely.
'processing/processing_hooks': value => $p_hooks;

3
releasenotes/notes/update-inspector-manifest-49feae86530015d7.yaml Normal file
View File

@ -0,0 +1,3 @@
---
features:
- Added 'ironic/ironic_url','swift/container' parameters to manifests/inspector.pp