[Ubuntu 14.04] Puppet catalog compilation error on ruby-1.9+

[Aleksandr Didenko]

I'm getting the following error when running noop tests for our master branch manifests on nove-network configs:

Error: undefined method `each' for "":String at /home/adidenko/tmp/fuel-library/deployment/puppet/osnailyfacter/examples/site.pp:69 on node node-8.kha.mirantis.net
/home/adidenko/tmp/fuel-library/deployment/puppet/l23network/lib/puppet/parser/functions/lib/hash_tools.rb:18:in `sanitize_keys_in_hash'
/home/adidenko/tmp/fuel-library/deployment/puppet/l23network/lib/puppet/parser/functions/prepare_network_config.rb:33:in `block in <module:Functions>'
/var/lib/gems/1.9.1/gems/puppet-3.4.3/lib/puppet/parser/functions.rb:144:in `block (2 levels) in newfunction'

On puppet-3.4 and ruby-1.8 (OS nodes):
root@node-1:~# puppet apply -e 'prepare_network_config($zzz)'
Notice: Compiled catalog for node-1.test.domain.local in environment production in 0.33 seconds
Notice: Finished catalog run in 0.16 seconds

On puppet-3.4 and ruby-2.1 (fuel master node):
# puppet apply -e 'prepare_network_config($zzz)'
Error: undefined method `each' for "":String at line 1 on node nailgun.test.domain.local
Wrapped exception:
undefined method `each' for "":String

Here's a problem:
https://github.com/stackforge/fuel-library/blob/master/deployment/puppet/osnailyfacter/examples/site.pp#L69

We don't have $::fuel_settings['network_scheme'] hash on nova-network, only on neutron configs. On nova-network hash with net settings is $::fuel_settings['network_data']

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/145805

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/6.0
Review: https://review.openstack.org/145806

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/145805
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=23f0e7b74a4ea25c2123d1c659dd970ac40ee9f1
Submitter: Jenkins
Branch: master

commit 23f0e7b74a4ea25c2123d1c659dd970ac40ee9f1
Author: Sergii Golovatiuk <email address hidden>
Date: Thu Jan 8 16:03:20 2015 +0100

    Fix catalog compilation on nova-network

    Move function back to netroun clauses as astute.yaml doesn't have
    $::fuel_settings['network_scheme'] for nova-network

    Change-Id: Ic5115cc221dbfe0358dff65197800659a4f73c31
    Closes-Bug: 1401818

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/145806
Committed: https://git.openstack.org/cgit/stackforge/fuel-library/commit/?id=c3da1829a75fa9b59ad395df3772a298daecab27
Submitter: Jenkins
Branch: stable/6.0

commit c3da1829a75fa9b59ad395df3772a298daecab27
Author: Sergii Golovatiuk <email address hidden>
Date: Thu Jan 8 16:03:20 2015 +0100

    Fix catalog compilation on nova-network

    Move function back to netroun clauses as astute.yaml doesn't have
    $::fuel_settings['network_scheme'] for nova-network

    Change-Id: Ic5115cc221dbfe0358dff65197800659a4f73c31
    Closes-Bug: 1401818

[Alexander Kurenyshev (akurenyshev)]

Verified on:
"ostf_sha": "f9c37d0876141e1550eb4e703a8e500cd463282f",
"release_versions": {"2014.2-6.1": {"VERSION": {"ostf_sha": "f9c37d0876141e1550eb4e703a8e500cd463282f",
"api": "1.0",
"nailgun_sha": "133576814fdab27dd03acfc0d36404a1c4fb00d3",
"production": "docker",
"python-fuelclient_sha": "61431ed16fc00039a269424bdbaa410277eff609",
"astute_sha": "bef3ec061d8db55342d677873819d296f5b46fe3",
"feature_groups": ["experimental"], "release": "6.1",
"fuelmain_sha": "c1671757bccb9cc79a7e4c61ed94387d9690be2d",
"fuellib_sha": "8188368446cf8991562cae43b18ba8ae083fbacf"}}}, "auth_required": true, "api": "1.0",
"nailgun_sha": "133576814fdab27dd03acfc0d36404a1c4fb00d3",
"production": "docker",
"python-fuelclient_sha": "61431ed16fc00039a269424bdbaa410277eff609",
"astute_sha": "bef3ec061d8db55342d677873819d296f5b46fe3",
"feature_groups": ["experimental"], "release": "6.1",
"fuelmain_sha": "c1671757bccb9cc79a7e4c61ed94387d9690be2d",
"fuellib_sha": "8188368446cf8991562cae43b18ba8ae083fbacf"

Steps were used for verify:

1) Create cluster with 3 controllers, 2 computes and 1 cinder node. Choose Nova-network
2) Deploy cluster

Deploy was successful without any errors.