Merge "Removed obsolete Fuel patches"

8 files changed, 15 insertions, 179 deletions

diff --git a/foreman/build/Makefile b/foreman/build/Makefile
index 8b87ce6..2d2a2a7 100644
--- a/foreman/build/Makefile
+++ b/foreman/build/Makefile
@@ -26,7 +26,7 @@ export VBOXDNLD = http://download.virtualbox.org/virtualbox/rpm/el/7.1/x86_64/Vi
 export VBOXRPM = $(shell pwd)/VirtualBox-4.3-4.3.26_98988_el7-1.x86_64.rpm
 export VAGRANTDNLD = https://dl.bintray.com/mitchellh/vagrant/vagrant_1.7.2_x86_64.rpm
 export VAGRANTRPM = $(shell pwd)/vagrant_1.7.2_x86_64.rpm
-export GENESISRPM = $(shell pwd)/x86_64/opnfv-genesis-0.1-1.x86_64.rpm
+export GENESISRPM = $(shell pwd)/x86_64/opnfv-genesis-0.2-1.x86_64.rpm
 
 # Note! Invoke with "make REVSTATE=RXXXX all" to make release build!
 # Invoke with ICOCACHE=/full/path/to/iso if cached ISO is in non-standard location.
@@ -106,8 +106,8 @@ rpm-clean:
 
 .PHONY: rpm
 rpm:
-	pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.1/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz
-	rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)' 
+	pushd ../../ && git archive --format=tar --prefix=opnfv-genesis-0.2/ HEAD | gzip > foreman/build/opnfv-genesis.tar.gz
+	rpmbuild -ba opnfv-genesis.spec -D '_topdir %(echo `pwd`)' -D '_builddir %(echo `pwd`)' -D '_sourcedir %(echo `pwd`)' -D '_rpmdir %(echo `pwd`)' -D '_specdir %(echo `pwd`)' -D '_srcrpmdir %(echo `pwd`)'
 	@make rpm-clean
 
 
diff --git a/foreman/build/cache.mk b/foreman/build/cache.mk
index fdfd003..56b7273 100644
--- a/foreman/build/cache.mk
+++ b/foreman/build/cache.mk
@@ -16,6 +16,8 @@ CACHECLEAN := $(addsuffix .clean,$(CACHEFILES) $(CACHEDIRS))
 # BEGIN of variables to customize
 #
 CACHEFILES += .versions
+CACHEFILES += $(shell basename $(VAGRANTRPM))
+CACHEFILES += $(shell basename $(VBOXRPM))
 CACHEFILES += $(shell basename $(ISOSRC))
 #
 # END of variables to customize
diff --git a/foreman/build/opnfv-genesis.spec b/foreman/build/opnfv-genesis.spec
index 674760f..30692b4 100644
--- a/foreman/build/opnfv-genesis.spec
+++ b/foreman/build/opnfv-genesis.spec
@@ -1,5 +1,5 @@
 Name:		opnfv-genesis
-Version:	0.1
+Version:	0.2
 Release:	1
 Summary:	The files from the OPNFV genesis repo
 
@@ -8,8 +8,8 @@ License:	Apache 2.0
 URL:		https://gerrit.opnfv.org/gerrit/genesis.git
 Source0:	opnfv-genesis.tar.gz
 
-#BuildRequires:	
-Requires:	vagrant, VirtualBox-4.3
+#BuildRequires:
+Requires:	vagrant, VirtualBox-4.3, net-tools
 
 %description
 The files from the OPNFV genesis repo
@@ -21,13 +21,16 @@ The files from the OPNFV genesis repo
 %build
 
 %install
-mkdir -p %{buildroot}/usr/bin/
-cp foreman/ci/deploy.sh %{buildroot}/usr/bin/
+mkdir -p %{buildroot}/root/genesis
+cp -r foreman/ %{buildroot}/root/genesis
+cp -r common/ %{buildroot}/root/genesis
 
 %files
-/usr/bin/deploy.sh
+/root/genesis
 
 
 %changelog
-* Fri Apr 24 2015 Dan Radez <dradez@redhatcom> - 0.1-1
+* Tue Sep 15 2015 Dan Radez <dradez@redhat.com> - 0.2-1
+- Updating the install files and cleaning up white space
+* Fri Apr 24 2015 Dan Radez <dradez@redhat.com> - 0.1-1
 - Initial Packaging
diff --git a/fuel/build/f_isoroot/f_bootstrap/post-scripts/01_fix_iommubug.sh b/fuel/build/f_isoroot/f_bootstrap/post-scripts/01_fix_iommubug.sh
deleted file mode 100755
index 79aa31a..0000000
--- a/fuel/build/f_isoroot/f_bootstrap/post-scripts/01_fix_iommubug.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#/bin/sh
-echo "Setting intel_iommu=off in bootstrap profile - a fix for the Dell systems"
-echo "Old settings"
-dockerctl shell cobbler cobbler profile report --name bootstrap
-echo "Modifying"
-dockerctl shell cobbler cobbler profile edit --name bootstrap --kopts "intel_iommu=off" --in-place
-echo "New settings"
-dockerctl shell cobbler cobbler profile report --name bootstrap
-
diff --git a/fuel/build/f_isoroot/f_bootstrap/post-scripts/02_fix_console_speed.sh b/fuel/build/f_isoroot/f_bootstrap/post-scripts/02_fix_console_speed.sh
deleted file mode 100755
index bf7591b..0000000
--- a/fuel/build/f_isoroot/f_bootstrap/post-scripts/02_fix_console_speed.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#/bin/sh
-echo "Changing console speed to 115200 (std is 9600) on bootstrap"
-echo "Old settings"
-dockerctl shell cobbler cobbler profile report --name bootstrap
-echo "Modifying"
-dockerctl shell cobbler cobbler profile edit --name bootstrap --kopts "console=tty0 console=ttyS0,115200" --in-place
-echo "New settings"
-dockerctl shell cobbler cobbler profile report --name bootstrap
-echo "Setting console speed to 115200 on ubuntu_1204_x86_64 (std is no serial console)"
-echo "Old settings"
-dockerctl shell cobbler cobbler profile report --name ubuntu_1204_x86_64
-echo "Modifying"
-dockerctl shell cobbler cobbler profile edit --name ubuntu_1204_x86_64 --kopts "console=tty0 console=ttyS0,115200" --in-place
-echo "New settings"
-dockerctl shell cobbler cobbler profile report --name ubuntu_1204_x86_64
diff --git a/fuel/build/fuel-main_1.patch b/fuel/build/fuel-main_1.patch
deleted file mode 100644
index 24b25b2..0000000
--- a/fuel/build/fuel-main_1.patch
+++ /dev/null
@@ -1,104 +0,0 @@
-diff --git a/docker/astute/Dockerfile b/docker/astute/Dockerfile
-index 55f617a..cd05f19 100644
---- a/docker/astute/Dockerfile
-+++ b/docker/astute/Dockerfile
-@@ -5,7 +5,7 @@
- FROM fuel/centos
- MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y ruby21-nailgun-mcagents sysstat
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y ruby21-nailgun-mcagents sysstat
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/cobbler/Dockerfile b/docker/cobbler/Dockerfile
-index 0c80abd..3a3d966 100644
---- a/docker/cobbler/Dockerfile
-+++ b/docker/cobbler/Dockerfile
-@@ -5,7 +5,7 @@
- FROM fuel/centos
- MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y httpd cobbler dnsmasq xinetd tftp-server; ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y httpd cobbler dnsmasq xinetd tftp-server; ln -s /etc/dnsmasq.conf /etc/cobbler.dnsmasq.conf
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/mcollective/Dockerfile b/docker/mcollective/Dockerfile
-index e70e87d..d6554b7 100644
---- a/docker/mcollective/Dockerfile
-+++ b/docker/mcollective/Dockerfile
-@@ -4,7 +4,7 @@ MAINTAINER Aleksandr Didenko adidenko@mirantis.com
-
- WORKDIR /root
-
--RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y sudo ruby21-mcollective
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y sudo ruby21-mcollective
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/ostf/Dockerfile b/docker/ostf/Dockerfile
-index 43f911e..8da9108 100644
---- a/docker/ostf/Dockerfile
-+++ b/docker/ostf/Dockerfile
-@@ -5,7 +5,7 @@
- FROM fuel/centos
- MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all; yum --quiet install -y python-fuelclient supervisor postgresql-libs
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*;echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all; yum --quiet install -y python-fuelclient supervisor postgresql-libs
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/postgres/Dockerfile b/docker/postgres/Dockerfile
-index b2930db..63cc4c2 100644
---- a/docker/postgres/Dockerfile
-+++ b/docker/postgres/Dockerfile
-@@ -3,7 +3,7 @@ FROM fuel/centos
-
- MAINTAINER Aleksandr Didenko adidenko@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y sudo
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y sudo
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/rabbitmq/Dockerfile b/docker/rabbitmq/Dockerfile
-index 201648f..4f3b67c 100644
---- a/docker/rabbitmq/Dockerfile
-+++ b/docker/rabbitmq/Dockerfile
-@@ -3,7 +3,7 @@
- FROM fuel/centos
- MAINTAINER Aleksandr Didenko adidenko@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y rabbitmq-server
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all; yum --quiet install -y rabbitmq-server
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/rsync/Dockerfile b/docker/rsync/Dockerfile
-index ef737bd..b6eefd1 100644
---- a/docker/rsync/Dockerfile
-+++ b/docker/rsync/Dockerfile
-@@ -5,7 +5,7 @@
- FROM fuel/centos
- MAINTAINER Matthew Mosesohn mmosesohn@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y ruby21-puppet xinetd rsync logrotate
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo;yum clean all;yum --quiet install -y ruby21-puppet xinetd rsync logrotate
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
-diff --git a/docker/rsyslog/Dockerfile b/docker/rsyslog/Dockerfile
-index 5efd623..8721b39 100644
---- a/docker/rsyslog/Dockerfile
-+++ b/docker/rsyslog/Dockerfile
-@@ -2,7 +2,7 @@ FROM fuel/centos
-
- MAINTAINER Aleksandr Didenko adidenko@mirantis.com
-
--RUN rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all;yum --quiet install -y anacron rsyslog
-+RUN sleep 15; rm -rf /etc/yum.repos.d/*; echo -e "[nailgun]\nname=Nailgun Local Repo\nbaseurl=http://$(route -n | awk '/^0.0.0.0/ { print $2 }'):_PORT_/os/x86_64/\ngpgcheck=0" > /etc/yum.repos.d/nailgun.repo; yum clean all;yum --quiet install -y anacron rsyslog
-
- ADD etc /etc
- ADD start.sh /usr/local/bin/start.sh
diff --git a/fuel/build/fuel-main_2.patch b/fuel/build/fuel-main_2.patch
deleted file mode 100644
index 72588cb..0000000
--- a/fuel/build/fuel-main_2.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-*** fuel-main/sandbox.mk.orig	2015-02-13 12:12:55.362989171 +0100
---- fuel-main/sandbox.mk	2015-02-13 14:50:39.103017653 +0100
-***************
-*** 71,77 ****
---- 71,83 ----
-  echo "Updating apt package database"
-  sudo chroot $(SANDBOX_UBUNTU) apt-get update
-  echo "Installing additional packages: $(SANDBOX_DEB_PKGS)"
-+ test -e $(SANDBOX_UBUNTU)/sbin/start.orig || mv $(SANDBOX_UBUNTU)/sbin/start $(SANDBOX_UBUNTU)/sbin/start.orig
-+ echo "#!/bin/sh" > $(SANDBOX_UBUNTU)/sbin/start
-+ echo "exit 0" >> $(SANDBOX_UBUNTU)/sbin/start
-+ chmod 755 $(SANDBOX_UBUNTU)/sbin/start
-  test -n "$(SANDBOX_DEB_PKGS)" && sudo chroot $(SANDBOX_UBUNTU) apt-get install --yes $(SANDBOX_DEB_PKGS)
-+ test -e $(SANDBOX_UBUNTU)/sbin/start.orig && (cp $(SANDBOX_UBUNTU)/sbin/start.orig $(SANDBOX_UBUNTU)/sbin/start; \
-+ 	rm $(SANDBOX_UBUNTU)/sbin/start.orig)
-  echo "SANDBOX_UBUNTU_UP: done"
-  endef
-
diff --git a/fuel/build/fuel-main_4.patch b/fuel/build/fuel-main_4.patch
deleted file mode 100644
index ba8a088..0000000
--- a/fuel/build/fuel-main_4.patch
+++ /dev/null
@@ -1,23 +0,0 @@
---- simple_http_daemon.py.orig	2015-08-12 18:28:10.432593984 +0200
-+++ simple_http_daemon.py	2015-08-12 18:36:05.291038788 +0200
-@@ -18,7 +18,10 @@
- import os
- import time
- import daemon
--import daemon.pidlockfile
-+try:
-+    from daemon.pidlockfile import PIDLockFile
-+except ImportError:
-+    from lockfile.pidlockfile import PIDLockFile
- import BaseHTTPServer
- from SimpleHTTPServer import SimpleHTTPRequestHandler
- 
-@@ -47,7 +50,7 @@
-         context = daemon.DaemonContext(
-             working_directory=os.getcwd(),
-             umask=0o002,
--            pidfile=daemon.pidlockfile.PIDLockFile(self.pid_file)
-+            pidfile=PIDLockFile(self.pid_file)
-         )
-         with context:
-             self.run_http_server()