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>

7 files changed, 0 insertions, 143 deletions

diff --git a/fuel/build/f_l23network/Makefile b/fuel/build/f_l23network/Makefile
deleted file mode 100644
index 0949737..0000000
--- a/fuel/build/f_l23network/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-TOP := $(shell pwd)
-
-.PHONY: all
-all:
-
-.PHONY: clean
-clean:
-	@rm -rf tmp
-	@rm -rf release
-
-.PHONY: validate-cache
-validate-cache:
-	@echo "No cache validation schema available for $(shell pwd)"
-	@echo "Continuing ..."
-
-.PHONY: release
-release:
-	@cp -Rvp puppet/modules/* $(PUPPET_DEST)
diff --git a/fuel/build/f_l23network/README b/fuel/build/f_l23network/README
deleted file mode 100644
index 9aa4718..0000000
--- a/fuel/build/f_l23network/README
+++ /dev/null
@@ -1,35 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-Addition to add entries to /etc/hosts through Astute.
-
-The astute.yaml file should contain entries as those below to have them picked up during deployment:
-
-opnfv:
-  hosts:
-  - name: test1
-    address: 192.168.100.100
-    fqdn: test1.opnfv.org
-  - name: test2
-    address: 192.168.100.101
-    fqdn: test2.opnfv.org
-  - name: test3
-    address: 192.168.100.102
-    fqdn: test3.opnfv.org
-
-The suggested method for adding this information is to prepare for deployment with the Fuel GUI or CLI,
-but before actually deploying:
-
-1. Download the current deployment for all hosts: fuel --env 1 deployment --default
-2. Iterate through the hosts in "deployment_1" and add hosts configuration in the above format to their
-   respective yaml file.
-3. Upload the modifed deployment information: fuel --env 1 deployment --upload
-
-After deploying, the additions will be included in /etc/astute.yaml of each host.
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)
-}
diff --git a/fuel/build/f_l23network/testing/README b/fuel/build/f_l23network/testing/README
deleted file mode 100644
index b68eddf..0000000
--- a/fuel/build/f_l23network/testing/README
+++ /dev/null
@@ -1,12 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 Ericsson AB and others.
-# stefan.k.berg@ericsson.com
-# jonas.bjurel@ericsson.com
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-In order to test the functionality without performing a full deployment, run "puppet apply" on the fake_init.pp
-which will call only the l23network::hosts_file class.
diff --git a/fuel/build/f_l23network/testing/fake_init.pp b/fuel/build/f_l23network/testing/fake_init.pp
deleted file mode 100644
index bc6b163..0000000
--- a/fuel/build/f_l23network/testing/fake_init.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-$fuel_settings = parseyaml($astute_settings_yaml)
-
-if $::fuel_settings['nodes'] {
-  $nodes_hash = $::fuel_settings['nodes']
-  $extras_hash = $::fuel_settings['opnfv']['hosts']
-
-  class {'l23network::hosts_file':
-    nodes  => $nodes_hash,
-    extras => $extras_hash
-  }
-
-  include l23network::hosts_file
-}