Use hiera_hash() instead hiera() for some hashes.
The following hiera lookups should always be hiera_hash: * network_scheme Removed array lookup for nameservers dns_nameservers is now a normal priority lookup, not array Removed unused novanetwork_parameters lookup Change-Id: I57c5a41a8c302fdb2d8e9ad7773688705e1b1f4e Closes-bug: #1517399
This commit is contained in:
parent
0fd237418e
commit
58bc9a7493
@ -1,6 +1,7 @@
|
|||||||
notice('MODULAR: configure_default_route.pp')
|
notice('MODULAR: configure_default_route.pp')
|
||||||
|
|
||||||
$network_scheme = hiera('network_scheme')
|
|
||||||
|
$network_scheme = hiera_hash('network_scheme')
|
||||||
$management_vrouter_vip = hiera('management_vrouter_vip')
|
$management_vrouter_vip = hiera('management_vrouter_vip')
|
||||||
$management_role = 'management'
|
$management_role = 'management'
|
||||||
$fw_admin_role = 'fw-admin'
|
$fw_admin_role = 'fw-admin'
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
notice('MODULAR: netconfig.pp')
|
notice('MODULAR: netconfig.pp')
|
||||||
|
|
||||||
$network_scheme = hiera('network_scheme')
|
$network_scheme = hiera_hash('network_scheme')
|
||||||
|
|
||||||
if ( $::l23_os =~ /(?i:centos6)/ and $::kernelmajversion == '3.10' ) {
|
if ( $::l23_os =~ /(?i:centos6)/ and $::kernelmajversion == '3.10' ) {
|
||||||
$ovs_datapath_package_name = 'kmod-openvswitch-lt'
|
$ovs_datapath_package_name = 'kmod-openvswitch-lt'
|
||||||
|
@ -15,7 +15,7 @@ $compute = $role in ['compute']
|
|||||||
if $use_neutron and ($controller or ($dvr and $compute)) {
|
if $use_neutron and ($controller or ($dvr and $compute)) {
|
||||||
$debug = hiera('debug', true)
|
$debug = hiera('debug', true)
|
||||||
$metadata_port = '8775'
|
$metadata_port = '8775'
|
||||||
$network_scheme = hiera('network_scheme', {})
|
$network_scheme = hiera_hash('network_scheme', {})
|
||||||
|
|
||||||
if $controller {
|
if $controller {
|
||||||
if $dvr {
|
if $dvr {
|
||||||
@ -24,7 +24,7 @@ if $use_neutron and ($controller or ($dvr and $compute)) {
|
|||||||
$agent_mode = 'legacy'
|
$agent_mode = 'legacy'
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
# works on copute nodes only if dvr is enabled
|
# works on compute nodes only if dvr is enabled
|
||||||
$agent_mode = 'dvr'
|
$agent_mode = 'dvr'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -4,9 +4,9 @@ $use_neutron = hiera('use_neutron', false)
|
|||||||
|
|
||||||
if $use_neutron {
|
if $use_neutron {
|
||||||
include nova::params
|
include nova::params
|
||||||
$neutron_config = hiera_hash('neutron_config')
|
$neutron_config = hiera_hash('neutron_config', {})
|
||||||
$neutron_integration_bridge = 'br-int'
|
$neutron_integration_bridge = 'br-int'
|
||||||
$nova_hash = hiera_hash('nova')
|
$nova_hash = hiera_hash('nova', {})
|
||||||
$libvirt_vif_driver = pick($nova_hash['libvirt_vif_driver'], 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver')
|
$libvirt_vif_driver = pick($nova_hash['libvirt_vif_driver'], 'nova.virt.libvirt.vif.LibvirtGenericVIFDriver')
|
||||||
|
|
||||||
$management_vip = hiera('management_vip')
|
$management_vip = hiera('management_vip')
|
||||||
@ -115,11 +115,10 @@ if $use_neutron {
|
|||||||
}
|
}
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
|
$network_scheme = hiera_hash('network_scheme', {})
|
||||||
$network_scheme = hiera('network_scheme', { })
|
|
||||||
prepare_network_config($network_scheme)
|
prepare_network_config($network_scheme)
|
||||||
|
|
||||||
$nova_hash = hiera_hash('nova_hash', { })
|
$nova_hash = hiera_hash('nova', { })
|
||||||
$bind_address = get_network_role_property('nova/api', 'ipaddr')
|
$bind_address = get_network_role_property('nova/api', 'ipaddr')
|
||||||
$public_int = get_network_role_property('public/vip', 'interface')
|
$public_int = get_network_role_property('public/vip', 'interface')
|
||||||
$private_interface = get_network_role_property('nova/private', 'interface')
|
$private_interface = get_network_role_property('nova/private', 'interface')
|
||||||
@ -128,14 +127,13 @@ if $use_neutron {
|
|||||||
$nova_rate_limits = hiera('nova_rate_limits')
|
$nova_rate_limits = hiera('nova_rate_limits')
|
||||||
$network_size = hiera('network_size', undef)
|
$network_size = hiera('network_size', undef)
|
||||||
$network_manager = hiera('network_manager', undef)
|
$network_manager = hiera('network_manager', undef)
|
||||||
$network_config = hiera('network_config', { })
|
$network_config = hiera('network_config', {})
|
||||||
$create_networks = true
|
$create_networks = true
|
||||||
$num_networks = hiera('num_networks', '1')
|
$num_networks = hiera('num_networks', '1')
|
||||||
$novanetwork_params = hiera('novanetwork_parameters')
|
|
||||||
$fixed_range = hiera('fixed_network_range')
|
$fixed_range = hiera('fixed_network_range')
|
||||||
$use_vcenter = hiera('use_vcenter', false)
|
$use_vcenter = hiera('use_vcenter', false)
|
||||||
$enabled_apis = 'metadata'
|
$enabled_apis = 'metadata'
|
||||||
$dns_nameservers = hiera_array('dns_nameservers', [])
|
$dns_nameservers = hiera('dns_nameservers', [])
|
||||||
|
|
||||||
if ! $fixed_range {
|
if ! $fixed_range {
|
||||||
fail('Must specify the fixed range when using nova-networks')
|
fail('Must specify the fixed range when using nova-networks')
|
||||||
|
Loading…
Reference in New Issue
Block a user