openstack
/
fuel-library
Code Issues Proposed changes

Merge "Use hiera_hash() instead hiera() for some hashes."

This commit is contained in:
Jenkins 2015-11-26 10:58:27 +00:00 committed by Gerrit Code Review
parent c8957483a6 58bc9a7493
commit 9d5e5a9d29
4 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/osnailyfacter/modular/netconfig/configure_default_route.pp
View File

@ -1,6 +1,7 @@
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_role = 'management'
$fw_admin_role = 'fw-admin'

2
deployment/puppet/osnailyfacter/modular/netconfig/netconfig.pp
View File

@ -1,6 +1,6 @@
notice('MODULAR: netconfig.pp')
$network_scheme = hiera('network_scheme')
$network_scheme = hiera_hash('network_scheme')
if ( $::l23_os =~ /(?i:centos6)/ and $::kernelmajversion == '3.10' ) {
$ovs_datapath_package_name = 'kmod-openvswitch-lt'

4
deployment/puppet/osnailyfacter/modular/openstack-network/agents/l3.pp
View File

@ -15,7 +15,7 @@ $compute = $role in ['compute']
if $use_neutron and ($controller or ($dvr and $compute)) {
$debug = hiera('debug', true)
$metadata_port = '8775'
$network_scheme = hiera('network_scheme', {})
$network_scheme = hiera_hash('network_scheme', {})
if $controller {
if $dvr {
@ -24,7 +24,7 @@ if $use_neutron and ($controller or ($dvr and $compute)) {
$agent_mode = 'legacy'
}
} else {
# works on copute nodes only if dvr is enabled
# works on compute nodes only if dvr is enabled
$agent_mode = 'dvr'
}

14
deployment/puppet/osnailyfacter/modular/openstack-network/compute-nova.pp
View File

@ -4,9 +4,9 @@ $use_neutron = hiera('use_neutron', false)
if $use_neutron {
include nova::params
$neutron_config = hiera_hash('neutron_config')
$neutron_config = hiera_hash('neutron_config', {})
$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')
$management_vip = hiera('management_vip')
@ -115,11 +115,10 @@ if $use_neutron {
}
} else {
$network_scheme = hiera('network_scheme', { })
$network_scheme = hiera_hash('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')
$public_int = get_network_role_property('public/vip', 'interface')
$private_interface = get_network_role_property('nova/private', 'interface')
@ -128,14 +127,13 @@ if $use_neutron {
$nova_rate_limits = hiera('nova_rate_limits')
$network_size = hiera('network_size', undef)
$network_manager = hiera('network_manager', undef)
$network_config = hiera('network_config', { })
$network_config = hiera('network_config', {})
$create_networks = true
$num_networks = hiera('num_networks', '1')
$novanetwork_params = hiera('novanetwork_parameters')
$fixed_range = hiera('fixed_network_range')
$use_vcenter = hiera('use_vcenter', false)
$enabled_apis = 'metadata'
$dns_nameservers = hiera_array('dns_nameservers', [])
$dns_nameservers = hiera('dns_nameservers', [])
if ! $fixed_range {
fail('Must specify the fixed range when using nova-networks')