From 6cb518c68eb136ad448e96716ef8b1348440949f Mon Sep 17 00:00:00 2001
From: Jonas Bjurel <jonas.bjurel@ericsson.com>
Date: Mon, 2 Mar 2015 22:46:45 +0100
Subject: Starting point for ODL Integration ***CAN BE MERGED*** - ODL build
 and installation (puppet manifests) including needed dependencies - Modified
 in accordance with Randy Levensalors comments - Added chmod 4755
 /bin/fusermount due to that lately some systems dont install fuseiso   withe
 SUID set for fusermount. Investing ongoing on why and why not consistent. -
 Rebased with master - ODL disabled in top Make (enable it by uncommenting the
 odl dirs - Removed white spaces - Hopefully fixed an issue with the docker
 ubuntu repos, added --no-cache=true to the fuel/docker/Make file.

TODO:
- Refactor collecting ODL and Java dependencies to one common place
- Refactoring top Makefile
- Adding CI hooks for build and deploy
- Finishing integration plumbing wit Neutron/ML2 and OVS/OVSDB

Change-Id: I13dd4d3a72d099316dfaa9f7cd9140781be2397b
Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
---
 .../lib/puppet/parser/functions/extras_to_hosts.rb  | 21 +++++++++++++++++++++
 .../modules/l23network/manifests/hosts_file.pp      | 18 ++++++++++++++++++
 .../modules/l23network/manifests/hosts_file.pp.orig | 16 ++++++++++++++++
 3 files changed, 55 insertions(+)
 create mode 100644 fuel/build/f_l23network/puppet/modules/l23network/lib/puppet/parser/functions/extras_to_hosts.rb
 create mode 100644 fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp
 create mode 100644 fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp.orig

(limited to 'fuel/build/f_l23network/puppet/modules/l23network')

diff --git a/fuel/build/f_l23network/puppet/modules/l23network/lib/puppet/parser/functions/extras_to_hosts.rb b/fuel/build/f_l23network/puppet/modules/l23network/lib/puppet/parser/functions/extras_to_hosts.rb
new file mode 100644
index 0000000..33bfad8
--- /dev/null
+++ b/fuel/build/f_l23network/puppet/modules/l23network/lib/puppet/parser/functions/extras_to_hosts.rb
@@ -0,0 +1,21 @@
+#
+# array_or_string_to_array.rb
+#
+
+module Puppet::Parser::Functions
+  newfunction(:extras_to_hosts, :type => :rvalue, :doc => <<-EOS
+              convert extras array passed from Astute into
+              hash for puppet `host` create_resources call
+    EOS
+  ) do |args|
+    hosts=Hash.new
+    extras=args[0]
+    extras.each do |extras|
+      hosts[extras['name']]={:ip=>extras['address'],:host_aliases=>[extras['fqdn']]}
+      notice("Generating extras host entry #{extras['name']} #{extras['address']} #{extras['fqdn']}")
+    end
+    return hosts
+  end
+end
+
+# vim: set ts=2 sw=2 et :
diff --git a/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp b/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp
new file mode 100644
index 0000000..05cff8d
--- /dev/null
+++ b/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp
@@ -0,0 +1,18 @@
+class l23network::hosts_file (
+  $nodes,
+  $extras=[],
+  $hosts_file = "/etc/hosts"
+) {
+
+  # OPNFV addition: Add additional lines in /etc/hosts through Astute additions
+
+  $host_resources = nodes_to_hosts($nodes)
+  $extras_host_resources = extras_to_hosts($extras)
+  Host {
+    ensure => present,
+    target => $hosts_file
+  }
+
+  create_resources(host, $host_resources)
+  create_resources(host, $extras_host_resources)
+}
diff --git a/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp.orig b/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp.orig
new file mode 100644
index 0000000..2295e3f
--- /dev/null
+++ b/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp.orig
@@ -0,0 +1,16 @@
+class l23network::hosts_file (
+  $nodes,
+  $hosts_file = "/etc/hosts"
+) {
+
+  #Move original hosts file
+
+  $host_resources = nodes_to_hosts($nodes)
+
+  Host {
+    ensure => present,
+    target => $hosts_file
+  }
+
+  create_resources(host, $host_resources)
+}
-- 
cgit 1.2.3-korg