From 5d4a36b80fcd0b69e35e4d4f59cfb64a62453c28 Mon Sep 17 00:00:00 2001
From: "Stefan K. Berg" <stefan.k.berg@ericsson.com>
Date: Thu, 10 Sep 2015 14:46:28 +0200
Subject: Refactoring build system to support Fuel 6.1

As Fuel 6.1 has changed both Debian package handling (fetching
repositories from Internet) as well as Puppet packaging, the support
for patching these has been disabled.

The pre-deploy logic of Fuel has been removed together with a
number of patches applied on top of a Fuel build, among them
fixes for NTP, DNS and /etc/hosts injection.

Instead, when changed default behavior is required, this will be
introduced as Fuel plugins which more cleanly integrates into the
Fuel system, and also decouples additional functionality from the
ISO build stage.

Signed-off-by: Stefan K. Berg <stefan.k.berg@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 deletions(-)
 delete mode 100644 fuel/build/f_l23network/puppet/modules/l23network/lib/puppet/parser/functions/extras_to_hosts.rb
 delete mode 100644 fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp
 delete mode 100644 fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp.orig

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

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
deleted file mode 100644
index 33bfad8..0000000
--- a/fuel/build/f_l23network/puppet/modules/l23network/lib/puppet/parser/functions/extras_to_hosts.rb
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# 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
deleted file mode 100644
index 05cff8d..0000000
--- a/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index 2295e3f..0000000
--- a/fuel/build/f_l23network/puppet/modules/l23network/manifests/hosts_file.pp.orig
+++ /dev/null
@@ -1,16 +0,0 @@
-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