From 17a49854785b0de88c09409c4ea0aa0edb71f9a4 Mon Sep 17 00:00:00 2001 From: Vasyl Saienko Date: Mon, 13 Jun 2016 12:11:47 +0300 Subject: [PATCH] Allow to set provisioning_network_uuid This patch allows to configure provisioning_network_uuid ironic conductor option. Change-Id: I5f7cade7e38eff77fd0c2e2d0e2d8fba6d91f0f3 Related-Bug: #1526403 --- manifests/conductor.pp | 7 +++++++ spec/classes/ironic_conductor_spec.rb | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/manifests/conductor.pp b/manifests/conductor.pp index bcb9e339..0f64743d 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -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 diff --git a/spec/classes/ironic_conductor_spec.rb b/spec/classes/ironic_conductor_spec.rb index eaba5775..1439067b 100644 --- a/spec/classes/ironic_conductor_spec.rb +++ b/spec/classes/ironic_conductor_spec.rb @@ -65,6 +65,7 @@ describe 'ironic::conductor' do is_expected.to contain_ironic_config('conductor/api_url').with(:value => '') is_expected.to contain_ironic_config('glance/swift_account').with(:value => '') is_expected.to contain_ironic_config('neutron/cleaning_network_uuid').with(:value => '') + is_expected.to contain_ironic_config('neutron/provisioning_network_uuid').with(:value => '') 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