Merge "Fix 'globals' task idempotentency" into stable/mitaka

deployment/puppet/osnailyfacter/manifests/globals/globals.pp

@@ -242,8 +242,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

deployment/puppet/osnailyfacter/manifests/netconfig/netconfig.pp

@@ -107,7 +107,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',

deployment/puppet/osnailyfacter/templates/globals_yaml.erb

@@ -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 -%>

tests/noop/spec/hosts/netconfig/netconfig_spec.rb

@@ -15,10 +15,8 @@ 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'
     use_neutron      = Noop.hiera 'use_neutron'
-    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', {}