openstack/fuel-library
Code Issues Proposed changes

Merge "Fix 'globals' task idempotentency"

Browse Source
This commit is contained in:
Jenkins 2016-06-28 11:45:38 +00:00 committed by Gerrit Code Review
commit 945c026e50
4 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/puppet/osnailyfacter/manifests/globals/globals.pp
View File

@ -234,8 +234,7 @@ class osnailyfacter::globals::globals {
}
)
$default_gateway = get_default_gateways()
$vips = $network_metadata['vips']
$vips = $network_metadata['vips']
# TODO(mpolenchuk): try_get_value() is deprecated,
# replace with dig() once stdlib 4.12 will be available

10
deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp
View File

@ -19,10 +19,10 @@ class osnailyfacter::netconfig::netconfig {
}
class { '::l23network' :
use_ovs => hiera('use_ovs', false),
ovs_datapath_package_name => $ovs_datapath_package_name,
use_dpdk => pick($dpdk_options['enabled'], false),
dpdk_options => $dpdk_options,
use_ovs => hiera('use_ovs', false),
ovs_datapath_package_name => $ovs_datapath_package_name,
use_dpdk => pick($dpdk_options['enabled'], false),
dpdk_options => $dpdk_options,
}
$sdn = generate_network_config()
notify {'SDN': message => $sdn }
@ -110,7 +110,7 @@ class osnailyfacter::netconfig::netconfig {
if $run_ping_checker {
# check that network was configured successfully
# and the default gateway is online
$default_gateway = hiera('default_gateway')
$default_gateway = get_default_gateways()
ping_host { $default_gateway :
ensure => 'up',

1
deployment/puppet/osnailyfacter/templates/globals_yaml.erb
View File

@ -22,7 +22,6 @@
<% globals.store "custom_mysql_setup_class", @custom_mysql_setup_class -%>
<% globals.store "database_nodes", @database_nodes -%>
<% globals.store "debug", @debug -%>
<% globals.store "default_gateway", @default_gateway -%>
<% globals.store "deployment_mode", @deployment_mode -%>
<% globals.store "dns_nameservers", @dns_nameservers -%>
<% globals.store "glance_backend", @glance_backend -%>

4
tests/noop/spec/hosts/netconfig/netconfig_spec.rb
View File

@ -15,9 +15,7 @@ manifest = 'netconfig/netconfig.pp'
describe manifest do
shared_examples 'catalog' do
network_metadata = Noop.hiera_hash 'network_metadata'
network_scheme = Noop.hiera_hash 'network_scheme'
default_gateway = Noop.hiera 'default_gateway'
default_gateway = Noop.puppet_function, 'get_default_gateways'
set_xps = Noop.hiera 'set_xps', true
set_rps = Noop.hiera 'set_rps', true
dpdk_config = Noop.hiera_hash 'dpdk', {}