openstack/puppet-nova
Code Issues Proposed changes

Expose my_ip

Browse Source 
If not set this defaults to the autodetecting the IP address of the interface
with a default gateway. This may not be the correct network for management
traffic when multiple nics are used.

Change-Id: Id22a6c990f424b9f3ca6159088540ea207460ffd
This commit is contained in:
Oliver Walsh
2017-08-31 00:11:14 +01:00
parent c60b1b3534
commit 4113aa73af
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
manifests/init.pp
View File

@@ -403,6 +403,12 @@
# per compute node. # per compute node.
# Defaults to $::os_service_default # Defaults to $::os_service_default
# #
# [*my_ip*]
# (optional) IP address of this host on the management network.
# If unset, will determine the IP programmatically based on the default route.
# If unable to do so, will use "127.0.0.1".
# Defaults to $::os_service_default.
#
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
# #
# [*rabbit_host*] # [*rabbit_host*]
@@ -526,6 +532,7 @@ class nova(
$ram_allocation_ratio = $::os_service_default, $ram_allocation_ratio = $::os_service_default,
$disk_allocation_ratio = $::os_service_default, $disk_allocation_ratio = $::os_service_default,
$purge_config = false, $purge_config = false,
$my_ip = $::os_service_default,
# DEPRECATED PARAMETERS # DEPRECATED PARAMETERS
$rabbit_host = $::os_service_default, $rabbit_host = $::os_service_default,
$rabbit_hosts = $::os_service_default, $rabbit_hosts = $::os_service_default,
@@ -650,6 +657,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
} }
nova_config { nova_config {
'DEFAULT/my_ip': value => $my_ip;
'api/auth_strategy': value => $auth_strategy; 'api/auth_strategy': value => $auth_strategy;
'DEFAULT/image_service': value => $image_service; 'DEFAULT/image_service': value => $image_service;
'DEFAULT/host': value => $host; 'DEFAULT/host': value => $host;

5
spec/classes/nova_init_spec.rb
View File

@@ -114,6 +114,7 @@ describe 'nova' do
:purge_config => false, :purge_config => false,
:block_device_allocate_retries => '60', :block_device_allocate_retries => '60',
:block_device_allocate_retries_interval => '3', :block_device_allocate_retries_interval => '3',
:my_ip => '192.0.2.1',
} }
end end
@@ -155,6 +156,10 @@ describe 'nova' do
is_expected.to contain_nova_config('DEFAULT/host').with_value('test-001.example.org') is_expected.to contain_nova_config('DEFAULT/host').with_value('test-001.example.org')
end end
it 'configures my_ip' do
is_expected.to contain_nova_config('DEFAULT/my_ip').with_value('192.0.2.1')
end
it 'configures upgrade_levels' do it 'configures upgrade_levels' do
is_expected.to contain_nova_config('upgrade_levels/cells').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/cells').with_value('1.0.0')
is_expected.to contain_nova_config('upgrade_levels/cert').with_value('1.0.0') is_expected.to contain_nova_config('upgrade_levels/cert').with_value('1.0.0')