From ab8f8baa4a690feec8c7cc8f53eca03f7225c874 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sat, 30 Oct 2021 10:28:20 +0900 Subject: [PATCH] Add support for [DEFAULT] my_ipv6 Change-Id: I892278b76a0369d632f228ee80b45074dc81d4f0 --- manifests/init.pp | 6 ++++++ releasenotes/notes/my_ipv6-286fc6e1650fd54e.yaml | 4 ++++ spec/classes/ironic_init_spec.rb | 1 + 3 files changed, 11 insertions(+) create mode 100644 releasenotes/notes/my_ipv6-286fc6e1650fd54e.yaml diff --git a/manifests/init.pp b/manifests/init.pp index eebda50a..1f2abfa7 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -35,6 +35,10 @@ # "127.0.0.1". # Defaults to $::os_service_default. # +# [*my_ipv6*] +# (optional) IP address of this host using IPv6. +# Defaults to $::os_service_default. +# # [*auth_strategy*] # (optional) Default protocol to use when connecting to glance # Defaults to 'keystone'. 'https' is the only other valid option for SSL @@ -278,6 +282,7 @@ class ironic ( $enabled = true, $package_ensure = 'present', $my_ip = $::os_service_default, + $my_ipv6 = $::os_service_default, $auth_strategy = 'keystone', $default_resource_class = $::os_service_default, $control_exchange = $::os_service_default, @@ -399,6 +404,7 @@ removed in a future realse. Use ironic::db::database_max_overflow instead') ironic_config { 'DEFAULT/auth_strategy': value => $auth_strategy; 'DEFAULT/my_ip': value => $my_ip; + 'DEFAULT/my_ipv6': value => $my_ipv6; 'DEFAULT/default_resource_class': value => $default_resource_class; 'DEFAULT/notification_level': value => $notification_level; 'DEFAULT/versioned_notifications_topics': value => $versioned_notifications_topics; diff --git a/releasenotes/notes/my_ipv6-286fc6e1650fd54e.yaml b/releasenotes/notes/my_ipv6-286fc6e1650fd54e.yaml new file mode 100644 index 00000000..bfbb7c7f --- /dev/null +++ b/releasenotes/notes/my_ipv6-286fc6e1650fd54e.yaml @@ -0,0 +1,4 @@ +--- +features: + - | + The new ``ironic::my_ipv6`` parameter has been added. diff --git a/spec/classes/ironic_init_spec.rb b/spec/classes/ironic_init_spec.rb index 88e4fbe0..de27676f 100644 --- a/spec/classes/ironic_init_spec.rb +++ b/spec/classes/ironic_init_spec.rb @@ -103,6 +103,7 @@ describe 'ironic' do it 'configures ironic.conf' do is_expected.to contain_ironic_config('DEFAULT/auth_strategy').with_value('keystone') is_expected.to contain_ironic_config('DEFAULT/my_ip').with_value('') + is_expected.to contain_ironic_config('DEFAULT/my_ipv6').with_value('') is_expected.to contain_ironic_config('DEFAULT/executor_thread_pool_size').with_value('') is_expected.to contain_ironic_config('DEFAULT/rpc_response_timeout').with_value('') is_expected.to contain_ironic_config('DEFAULT/rpc_transport').with_value('')