Expose my_ip
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
(cherry picked from commit 4113aa73af
)
This commit is contained in:
parent
82966150a1
commit
badc922792
|
@ -403,6 +403,12 @@
|
|||
# per compute node.
|
||||
# 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
|
||||
#
|
||||
# [*rabbit_host*]
|
||||
|
@ -520,6 +526,7 @@ class nova(
|
|||
$ram_allocation_ratio = $::os_service_default,
|
||||
$disk_allocation_ratio = $::os_service_default,
|
||||
$purge_config = false,
|
||||
$my_ip = $::os_service_default,
|
||||
# DEPRECATED PARAMETERS
|
||||
$rabbit_host = $::os_service_default,
|
||||
$rabbit_hosts = $::os_service_default,
|
||||
|
@ -649,6 +656,7 @@ but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
|
|||
ensure_resource('nova_config', 'DEFAULT/disk_allocation_ratio', { value => $real_disk_allocation_ratio })
|
||||
|
||||
nova_config {
|
||||
'DEFAULT/my_ip': value => $my_ip;
|
||||
'api/auth_strategy': value => $auth_strategy;
|
||||
'DEFAULT/image_service': value => $image_service;
|
||||
'DEFAULT/host': value => $host;
|
||||
|
|
|
@ -114,6 +114,7 @@ describe 'nova' do
|
|||
:purge_config => false,
|
||||
:block_device_allocate_retries => '60',
|
||||
:block_device_allocate_retries_interval => '3',
|
||||
:my_ip => '192.0.2.1',
|
||||
}
|
||||
end
|
||||
|
||||
|
@ -154,6 +155,10 @@ describe 'nova' do
|
|||
is_expected.to contain_nova_config('DEFAULT/host').with_value('test-001.example.org')
|
||||
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
|
||||
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')
|
||||
|
|
Loading…
Reference in New Issue