diff --git a/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/network_metadata_to_hosts.rb b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/network_metadata_to_hosts.rb
new file mode 100644
index 0000000000..a12d74a077
--- /dev/null
+++ b/deployment/puppet/osnailyfacter/lib/puppet/parser/functions/network_metadata_to_hosts.rb
@@ -0,0 +1,21 @@
+#
+# network_metadata_to_hosts
+#
+
+module Puppet::Parser::Functions
+  newfunction(:network_metadata_to_hosts, :type => :rvalue, :doc => <<-EOS
+              convert network_metadata hash to
+              hash for puppet `host` create_resources call
+    EOS
+  ) do |args|
+    hosts=Hash.new
+    nodes=args[0].fetch('nodes', {})
+    nodes.each do |name, props|
+      hosts[props['fqdn']]={:ip=>props['network_roles']['mgmt/vip'],:host_aliases=>[name]}
+      notice("Generating host entry #{name} #{props['network_roles']['mgmt/vip']} #{props['fqdn']}")
+    end
+    return hosts
+  end
+end
+
+# vim: set ts=2 sw=2 et :
\ No newline at end of file
diff --git a/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp b/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp
index e82bddff97..ac4d780bb1 100644
--- a/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp
+++ b/deployment/puppet/osnailyfacter/modular/hosts/hosts.pp
@@ -1,5 +1,12 @@
 notice('MODULAR: hosts.pp')
 
-class { "l23network::hosts_file":
-  nodes => hiera('nodes'),
+$hosts_file = '/etc/hosts'
+$host_resources = network_metadata_to_hosts(hiera_hash('network_metadata'))
+
+Host {
+    ensure => present,
+    target => $hosts_file
 }
+
+create_resources(host, $host_resources)
+
diff --git a/deployment/puppet/osnailyfacter/spec/functions/network_metadata_to_hosts__spec.rb b/deployment/puppet/osnailyfacter/spec/functions/network_metadata_to_hosts__spec.rb
new file mode 100644
index 0000000000..1d381ccce7
--- /dev/null
+++ b/deployment/puppet/osnailyfacter/spec/functions/network_metadata_to_hosts__spec.rb
@@ -0,0 +1,111 @@
+require 'spec_helper'
+require 'yaml'
+
+
+describe 'network_metadata_to_hosts' do
+
+let(:network_metadata) {"""
+---
+  nodes:
+    node-5:
+      swift_zone: '5'
+      uid: '5'
+      fqdn: node-5.domain.local
+      network_roles:
+        keystone/api: 10.88.0.6
+        neutron/api: 10.88.0.6
+        mgmt/database: 10.88.0.6
+        mgmt/vip: 10.88.0.6
+        sahara/api: 10.88.0.6
+      user_node_name: CO22
+      node_roles:
+      - compute
+      name: node-5
+    node-4:
+      swift_zone: '4'
+      uid: '4'
+      fqdn: node-4.domain.local
+      network_roles:
+        keystone/api: 10.88.0.7
+        neutron/api: 10.88.0.7
+        mgmt/database: 10.88.0.7
+        mgmt/vip: 10.88.0.7
+        sahara/api: 10.88.0.7
+        heat/api: 10.88.0.7
+        ceilometer/api: 10.88.0.7
+        ex: 10.88.1.132
+      user_node_name: CNT21
+      node_roles:
+      - primary-controller
+      name: node-4
+    node-6:
+      swift_zone: '6'
+      uid: '6'
+      fqdn: node-6.domain.local
+      network_roles:
+        keystone/api: 10.88.0.8
+        neutron/api: 10.88.0.8
+        mgmt/database: 10.88.0.8
+        sahara/api: 10.88.0.8
+        ceilometer/api: 10.88.0.8
+        mgmt/vip: 10.88.0.8
+      user_node_name: CO23
+      node_roles:
+      - compute
+      name: node-6
+  vips:
+    vrouter_pub:
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+      namespace: vrouter
+      ipaddr: 10.88.1.130
+    management:
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+      namespace: haproxy
+      ipaddr: 10.88.0.10
+    public:
+      network_role: public/vip
+      node_roles:
+      - controller
+      - primary-controller
+      namespace: haproxy
+      ipaddr: 10.88.1.131
+    vrouter:
+      network_role: mgmt/vip
+      node_roles:
+      - controller
+      - primary-controller
+      namespace: vrouter
+      ipaddr: 10.88.0.9
+"""}
+
+
+  let(:scope) { PuppetlabsSpec::PuppetInternals.scope }
+
+  before(:each) do
+    puppet_debug_override()
+  end
+
+  subject do
+    function_name = Puppet::Parser::Functions.function('network_metadata_to_hosts')
+    scope.method(function_name)
+  end
+
+  it 'should exist' do
+    expect(subject).to eq scope.method('function_network_metadata_to_hosts')
+  end
+
+  it 'should return hash for creating set of "host" puppet resources by create_resources()' do
+    expect(scope.function_network_metadata_to_hosts([YAML.load(network_metadata)])).to eq({
+      'node-6.domain.local' => {:ip => '10.88.0.8', :host_aliases => ['node-6']},
+      'node-5.domain.local' => {:ip => '10.88.0.6', :host_aliases => ['node-5']},
+      'node-4.domain.local' => {:ip => '10.88.0.7', :host_aliases => ['node-4']},
+    })
+  end
+
+end