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, 1 insertions, 158 deletions

diff --git a/fuel/build/patch-packages/Makefile b/fuel/build/patch-packages/Makefile
index bd3a437..339c9e7 100644
--- a/fuel/build/patch-packages/Makefile
+++ b/fuel/build/patch-packages/Makefile
@@ -8,7 +8,7 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-SUBDIRS := debootstrap novnc neutron-common
+SUBDIRS := 
 SUBCLEAN = $(addsuffix .clean,$(SUBDIRS))
 
 .PHONY: $(SUBDIRS) $(SUBCLEAN) clean
diff --git a/fuel/build/patch-packages/debootstrap/Makefile b/fuel/build/patch-packages/debootstrap/Makefile
deleted file mode 100644
index 0109312..0000000
--- a/fuel/build/patch-packages/debootstrap/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 udebPackage
-	@rm -rf *.udeb
-	@rm -rf patch-replacements
-	@rm -rf .udebpackage
-
-.PHONY: release
-release:
-	../tools/udeb_unpack debootstrap-udeb_1.0.4*.udeb $(ORIGISO)
-	patch -s -p0 < debootstrap.patch
-	../tools/udeb_pack $(REVSTATE)
-	@cp *.udeb $(UDEB_DEST)
diff --git a/fuel/build/patch-packages/debootstrap/debootstrap.patch b/fuel/build/patch-packages/debootstrap/debootstrap.patch
deleted file mode 100644
index 62342c9..0000000
--- a/fuel/build/patch-packages/debootstrap/debootstrap.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- udebPackage/usr/share/debootstrap/scripts/gutsy.orig	2014-11-10 18:21:37.000000000 +0000
-+++ udebPackage/usr/share/debootstrap/scripts/gutsy	2015-04-15 09:28:44.290437000 +0000
-@@ -112,7 +112,8 @@
-
- 	p; progress $baseprog $bases INSTCORE "Installing core packages" #2
- 	ln -sf mawk "$TARGET/usr/bin/awk"
--	x_core_install base-files base-passwd
-+	x_core_install base-passwd
-+	x_core_install base-files
- 	p; progress $baseprog $bases INSTCORE "Installing core packages" #3
- 	x_core_install dpkg
-
diff --git a/fuel/build/patch-packages/neutron-common/Makefile b/fuel/build/patch-packages/neutron-common/Makefile
deleted file mode 100644
index e9d43a4..0000000
--- a/fuel/build/patch-packages/neutron-common/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-TOP := $(shell pwd)
-
-.PHONY: all
-all:
-
-.PHONY: clean
-clean:
-	@rm -rf package
-	@rm -rf *.deb
-	@rm -rf patch-replacements
-	@rm -rf .package
-
-.PHONY: release
-release:
-	../tools/deb_unpack neutron-common_*.deb $(ORIGISO)
-	patch -s -p0 < quota.patch
-	../tools/deb_pack $(REVSTATE)
-	@cp *.deb ../release/packages
-	@cat patch-replacements >> ../release/patch-replacements
diff --git a/fuel/build/patch-packages/neutron-common/quota.patch b/fuel/build/patch-packages/neutron-common/quota.patch
deleted file mode 100644
index 6f179f0..0000000
--- a/fuel/build/patch-packages/neutron-common/quota.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-*** package/etc/neutron/neutron.conf.orig	2015-05-25 15:50:09.933131041 +0200
---- package/etc/neutron/neutron.conf	2015-05-25 15:55:07.859210010 +0200
-***************
-*** 502,518 ****
-  # default_quota = -1
-  
-  # Number of networks allowed per tenant. A negative value means unlimited.
-! # quota_network = 10
-  
-  # Number of subnets allowed per tenant. A negative value means unlimited.
-! # quota_subnet = 10
-  
-  # Number of ports allowed per tenant. A negative value means unlimited.
-  # quota_port = 50
-  
-  # Number of security groups allowed per tenant. A negative value means
-  # unlimited.
-! # quota_security_group = 10
-  
-  # Number of security group rules allowed per tenant. A negative value means
-  # unlimited.
---- 502,521 ----
-  # default_quota = -1
-  
-  # Number of networks allowed per tenant. A negative value means unlimited.
-! # This quota modified by OPNFV: 10 -> 50
-! quota_network = 50
-  
-  # Number of subnets allowed per tenant. A negative value means unlimited.
-! # This quota modified by OPNFV: 10 -> 50
-! quota_subnet = 50
-  
-  # Number of ports allowed per tenant. A negative value means unlimited.
-  # quota_port = 50
-  
-  # Number of security groups allowed per tenant. A negative value means
-  # unlimited.
-! # This quota modified by OPNFV: 10 -> 50
-! quota_security_group = 50
-  
-  # Number of security group rules allowed per tenant. A negative value means
-  # unlimited.
-***************
-*** 538,547 ****
-  # quota_health_monitor = -1
-  
-  # Number of routers allowed per tenant. A negative value means unlimited.
-! # quota_router = 10
-  
-  # Number of floating IPs allowed per tenant. A negative value means unlimited.
-! # quota_floatingip = 50
-  
-  # Number of firewalls allowed per tenant. A negative value means unlimited.
-  # quota_firewall = 1
---- 541,552 ----
-  # quota_health_monitor = -1
-  
-  # Number of routers allowed per tenant. A negative value means unlimited.
-! # This quota modified by OPNFV: 10 -> 50
-! quota_router = 50
-  
-  # Number of floating IPs allowed per tenant. A negative value means unlimited.
-! # This quota modified by OPNFV: 50 -> 100
-! quota_floatingip = 100
-  
-  # Number of firewalls allowed per tenant. A negative value means unlimited.
-  # quota_firewall = 1
diff --git a/fuel/build/patch-packages/novnc/Makefile b/fuel/build/patch-packages/novnc/Makefile
deleted file mode 100644
index 16c0196..0000000
--- a/fuel/build/patch-packages/novnc/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-# This is a temporary patch which add missing files
-# inside novnc ubuntu package.
-# Related bug: https://bugs.launchpad.net/fuel/+bug/1433894
-TOP := $(shell pwd)
-
-.PHONY: all
-all:
-
-.PHONY: clean
-clean:
-	@rm -rf package
-	@rm -rf *.deb
-	@rm -rf patch-replacements
-	@rm -rf .package
-
-.PHONY: release
-release:
-	../tools/deb_unpack novnc_0.5.1*.deb $(ORIGISO)
-	./fix-missing.sh
-	../tools/deb_pack $(REVSTATE)
-	@cp *.deb ../release/packages
-	@cat patch-replacements >> ../release/patch-replacements
diff --git a/fuel/build/patch-packages/novnc/fix-missing.sh b/fuel/build/patch-packages/novnc/fix-missing.sh
deleted file mode 100755
index 61ef1db..0000000
--- a/fuel/build/patch-packages/novnc/fix-missing.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-MISSING_FILES="keyboard.js keysymdef.js keysym.js"
-NOVNC_SOURCE="http://raw.githubusercontent.com/kanaka/noVNC/v0.5.1/include"
-
-for file in $MISSING_FILES
-do
-  wget -P package/usr/share/novnc/include/ "$NOVNC_SOURCE/$file"
-done