openstack/puppet-ironic
Code Issues Proposed changes

Allow to set provisioning_network_uuid

Browse Source 
This patch allows to configure provisioning_network_uuid
ironic conductor option.

Change-Id: I5f7cade7e38eff77fd0c2e2d0e2d8fba6d91f0f3
Related-Bug: #1526403
This commit is contained in:
Vasyl Saienko
2016-06-13 12:11:47 +03:00
parent d9a7a53115
commit 17a4985478
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/conductor.pp
View File

@@ -56,6 +56,11 @@
# (optional) Ironic API URL.
# Defaults to $::os_service_default
#
# [*provisioning_network_uuid*]
# (optional) Neutron network UUID for the ramdisk to be booted into for
# provisioning nodes. Required for neutron network interface.
# Defaults to $::os_service_default
#
class ironic::conductor (
$package_ensure = 'present',
$enabled = true,
@@ -65,6 +70,7 @@ class ironic::conductor (
$swift_account = $::os_service_default,
$cleaning_network_uuid = $::os_service_default,
$api_url = $::os_service_default,
$provisioning_network_uuid = $::os_service_default,
) {
include ::ironic::params
@@ -79,6 +85,7 @@ class ironic::conductor (
'conductor/api_url': value => $api_url;
'glance/swift_account': value => $swift_account;
'neutron/cleaning_network_uuid': value => $cleaning_network_uuid;
'neutron/provisioning_network_uuid': value => $provisioning_network_uuid;
}
# Install package

5
spec/classes/ironic_conductor_spec.rb
View File

@@ -65,6 +65,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('conductor/api_url').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('glance/swift_account').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('neutron/cleaning_network_uuid').with(:value => '<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('neutron/provisioning_network_uuid').with(:value => '<SERVICE DEFAULT>')
end
context 'when overriding parameters' do
@@ -75,7 +76,8 @@ describe 'ironic::conductor' do
:automated_clean => false,
:swift_account => '00000000-0000-0000-0000-000000000000',
:cleaning_network_uuid => '00000000-0000-0000-0000-000000000000',
:api_url => 'https://127.0.0.1:6385'
:api_url => 'https://127.0.0.1:6385',
:provisioning_network_uuid => '00000000-0000-0000-0000-000000000000'
)
end
it 'should replace default parameter with new value' do
@@ -85,6 +87,7 @@ describe 'ironic::conductor' do
is_expected.to contain_ironic_config('conductor/api_url').with_value(p[:api_url])
is_expected.to contain_ironic_config('glance/swift_account').with_value(p[:swift_account])
is_expected.to contain_ironic_config('neutron/cleaning_network_uuid').with_value('00000000-0000-0000-0000-000000000000')
is_expected.to contain_ironic_config('neutron/provisioning_network_uuid').with_value('00000000-0000-0000-0000-000000000000')
end
end