From 07ed82e319bafd325fd2e47fd1a48836cec61124 Mon Sep 17 00:00:00 2001 From: yatin Date: Mon, 19 Nov 2018 11:27:48 +0530 Subject: [PATCH] Add transport_url to ironic-inspector https://review.openstack.org/#/c/584758/ now needs transport_url to be configured, this patch adds support to configure transport_url for ironic-inspector. Change-Id: If67800ef18cd3e4c8daa88f4c86b1b9dccbe440e --- manifests/inspector.pp | 8 ++++++++ ...d-inspector-transport-url-config-6b5bd87b6e7bd968.yaml | 7 +++++++ spec/classes/ironic_inspector_spec.rb | 1 + 3 files changed, 16 insertions(+) create mode 100644 releasenotes/notes/add-inspector-transport-url-config-6b5bd87b6e7bd968.yaml diff --git a/manifests/inspector.pp b/manifests/inspector.pp index 65fae20f..5685dcf0 100644 --- a/manifests/inspector.pp +++ b/manifests/inspector.pp @@ -225,6 +225,12 @@ # (optional) Boolean value to dtermine if ppc64le support should be enabled # Defaults to false (no ppc64le support) # +# [*default_transport_url*] +# (optional) A URL representing the messaging driver to use and its full +# configuration. Transport URLs take the form: +# transport://user:pass@host1:port[,hostN:portN]/virtual_host +# Defaults to 'fake://' +# class ironic::inspector ( $package_ensure = 'present', $enabled = true, @@ -273,6 +279,7 @@ class ironic::inspector ( $node_not_found_hook = $::os_service_default, $discovery_default_driver = $::os_service_default, $enable_ppc64le = false, + $default_transport_url = 'fake://', ) { include ::ironic::deps @@ -354,6 +361,7 @@ class ironic::inspector ( 'DEFAULT/listen_address': value => $listen_address; 'DEFAULT/auth_strategy': value => $auth_strategy; 'DEFAULT/timeout': value => $timeout; + 'DEFAULT/transport_url': value => $default_transport_url; 'capabilities/boot_mode': value => $detect_boot_mode; 'iptables/dnsmasq_interface': value => $dnsmasq_interface; 'processing/ramdisk_logs_dir': value => $ramdisk_logs_dir; diff --git a/releasenotes/notes/add-inspector-transport-url-config-6b5bd87b6e7bd968.yaml b/releasenotes/notes/add-inspector-transport-url-config-6b5bd87b6e7bd968.yaml new file mode 100644 index 00000000..c3c2f06b --- /dev/null +++ b/releasenotes/notes/add-inspector-transport-url-config-6b5bd87b6e7bd968.yaml @@ -0,0 +1,7 @@ +--- +features: + - | + Add transport_url config param for ironic-inspector. It's added + in ironic-inspector in https://review.openstack.org/#/c/584758/, + and is suggested to set it to 'fake://' when rpc backend not available + or not desired, so need to add support for it in puppet-ironic. diff --git a/spec/classes/ironic_inspector_spec.rb b/spec/classes/ironic_inspector_spec.rb index 20e68c80..2dcd9f63 100644 --- a/spec/classes/ironic_inspector_spec.rb +++ b/spec/classes/ironic_inspector_spec.rb @@ -102,6 +102,7 @@ describe 'ironic::inspector' do is_expected.to contain_ironic_inspector_config('DEFAULT/listen_address').with_value('') is_expected.to contain_ironic_inspector_config('DEFAULT/auth_strategy').with_value(p[:auth_strategy]) is_expected.to contain_ironic_inspector_config('DEFAULT/timeout').with_value('') + is_expected.to contain_ironic_inspector_config('DEFAULT/transport_url').with_value('fake://') is_expected.to contain_ironic_inspector_config('capabilities/boot_mode').with_value('') is_expected.to contain_ironic_inspector_config('iptables/dnsmasq_interface').with_value(p[:dnsmasq_interface]) is_expected.to contain_ironic_inspector_config('processing/ramdisk_logs_dir').with_value(p[:ramdisk_logs_dir])