openstack/puppet-ironic
Code Issues Proposed changes

Revert "allow to configure my_ip parameter"

Browse Source 
This has broken TripleO. There is a patch[1] up to update TripleO,
but it does much more than just configure my_ip via the Puppet
module, and there is no confirmation that it has even been tested
since we can't get far enough to actually exercise Ironic to do a
deployment in CI.

[1] Ibaa55b2d4264b07faeb307893ef746ed0eb1df0c

Partial-Bug: 1581479
This reverts commit 05d474c3b2.

Change-Id: I1db1baf6506d22c29a4e25fbe574e3df8578cb72
This commit is contained in:
James Slagle 2016-05-13 11:30:35 +00:00
parent 05d474c3b2
commit 5c4d023a77
2 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@ -37,12 +37,6 @@
# (optional) Print debug messages in the logs # (optional) Print debug messages in the logs
# Defaults to False # Defaults to False
# #
# [*my_ip*]
# (optional) IP address of this host.
# If unset, will determine the IP programmatically. If unable to do so, will use
# "127.0.0.1".
# Defaults to $::os_service_default.
#
# [*auth_strategy*] # [*auth_strategy*]
# (optional) Default protocol to use when connecting to glance # (optional) Default protocol to use when connecting to glance
# Defaults to 'keystone'. 'https' is the only other valid option for SSL # Defaults to 'keystone'. 'https' is the only other valid option for SSL
@ -221,7 +215,6 @@ class ironic (
$package_ensure = 'present', $package_ensure = 'present',
$verbose = undef, $verbose = undef,
$debug = undef, $debug = undef,
$my_ip = $::os_service_default,
$use_syslog = undef, $use_syslog = undef,
$use_stderr = undef, $use_stderr = undef,
$log_facility = undef, $log_facility = undef,
@ -318,7 +311,6 @@ class ironic (
ironic_config { ironic_config {
'DEFAULT/auth_strategy': value => $auth_strategy; 'DEFAULT/auth_strategy': value => $auth_strategy;
'DEFAULT/enabled_drivers': value => join($enabled_drivers, ','); 'DEFAULT/enabled_drivers': value => join($enabled_drivers, ',');
'DEFAULT/my_ip': value => $my_ip;
'glance/glance_num_retries': value => $glance_num_retries; 'glance/glance_num_retries': value => $glance_num_retries;
'glance/glance_api_insecure': value => $glance_api_insecure; 'glance/glance_api_insecure': value => $glance_api_insecure;
} }

1
spec/classes/ironic_init_spec.rb
View File

@ -120,7 +120,6 @@ describe 'ironic' do
it 'configures ironic.conf' 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/auth_strategy').with_value('keystone')
is_expected.to contain_ironic_config('DEFAULT/my_ip').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>') is_expected.to contain_ironic_config('DEFAULT/rpc_response_timeout').with_value('<SERVICE DEFAULT>')
is_expected.to contain_ironic_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>') is_expected.to contain_ironic_config('DEFAULT/control_exchange').with_value('<SERVICE DEFAULT>')
end end