[node-patches] Change in ovirt-node-iso[master]: Adding virt preview repo for fc20 Switching to use of ovirt-...

[tlitovsk at redhat.com]

Anatoly Litovsky has uploaded a new change for review.

Change subject: Adding virt preview repo for fc20 Switching to use of ovirt-node-vdsm recepie Allowing to select the main kickstart for use with local builds of ovirt node
......................................................................

Adding virt preview repo for fc20
Switching to use of ovirt-node-vdsm recepie
Allowing to select the main kickstart for use
with local builds of ovirt node

Change-Id: I3db401c1fb97ad013d94d24bc0c6aa4431e8d2eb
Signed-off-by: Tolik Litovsky <tlitovsk at redhat.com>
---
M Makefile.am
M configure.ac
M recepie-downloader.sh.in
3 files changed, 18 insertions(+), 5 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node-iso refs/changes/41/39441/1

diff --git a/Makefile.am b/Makefile.am
index b5e7215..795b875 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -16,7 +16,7 @@
 # also available at http://www.gnu.org/copyleft/gpl.html.
 
 PACKAGE           = @PACKAGE_NAME@
-NAME0			  = ovirt-node-image
+NAME0			  = @MAIN_KS@
 RECIPE            = $(PACKAGE).ks
 PRODUCT           = @PRODUCT_NAME@
 EXTRA_RECIPE      = @EXTRA_RECIPE@
@@ -31,7 +31,7 @@
 RELEASE 		  := $(shell rpm -q --qf "%{RELEASE}\n" --define "BUILD_NUMBER $(BUILD_NUMBER)" --specfile ./ovirt-node-iso.spec | head -n1)
 RECIPE_DIR 		  = @RECIPES@
 OVIRT_VERSION     = @PACKAGE_VERSION@
-REPO_SUFFIX        = @REPO_SUFFIX@
+REPO_SUFFIX       = @REPO_SUFFIX@
 
 OVIRT_CACHE_DIR	?= $(HOME)/ovirt-caches
 
@@ -105,9 +105,12 @@
         OVIRT_REPO_LINE="repo --name=ovirt-stable-repo --baseurl=$(OVIRT_BASE_URL)/fc$(FEDORA)\n" ;\
         FEDORA_REPO_LOC="repo --name=$${FEDORA_REPO} --mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH)\n" ;\
         UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates --mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH)\n" ;\
+        VIRT_PREVIEW_REPO_LINE="repo --name=$${FEDORA_REPO}-virt-preview --baseurl=https://fedorapeople.org/groups/virt/virt-preview/fedora-$(FEDORA)/$(ARCH)/\n" ;\
+        GLUSTER_REPO_LINE="repo --name=ovirt-$(OVIRT_VERSION)-glusterfs-${ARCH}-epel --baseurl=http://download.gluster.org/pub/gluster/glusterfs/nightly/glusterfs/fedora-$(FEDORA)-${ARCH}\n" ;\
         printf "$${OVIRT_REPO_LINE}" > repos.ks ;\
         printf "$${FEDORA_REPO_LOC}" >> repos.ks ;\
         printf "$${UPDATE_REPO_LINE}" >> repos.ks ;\
+        printf "$${GLUSTER_REPO_LINE}" >> repos.ks ;\
       fi ;\
       echo "# OVIRT_REPO_URL=$(OVIRT_REPO_URL)" >> $@ ;\
       for repo in $(OVIRT_REPO_URL); do \
@@ -124,10 +127,12 @@
 	    echo "VERSION=$(VERSION)" ;\
 	    echo "RELEASE=$(RELEASE)" ;\
 	) > $@
+	cat $(NAME0) > tmp-recepie.ks
 if USE_EXTRA_RECIPE
-	echo -e "\n%include $(EXTRA_RECIPE)" >> $(NAME0).ks
+	echo -e "\n%include $(EXTRA_RECIPE)" >> tmp-recepie.ks
 endif
-	ksflatten -c $(NAME0).ks -o $(PACKAGE).ks
+	ksflatten -c tmp-recepie.ks -o $(PACKAGE).ks
+	rm -rf tmp-recepie.ks
 
 $(PACKAGE).$(PKG_FMT) iso: kickstarts version.ks repos.ks
 	@test ! -e "$(PACKAGE_NAME)-$(VERSION)-$(RELEASE).iso" || ( echo "ERROR: $(PACKAGE_NAME)-$(VERSION)-$(RELEASE).iso already exists." && exit 1 )
diff --git a/configure.ac b/configure.ac
index 22f8e87..bb4c2d3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,13 @@
             [RECIPES=/usr/share/ovirt-node-recipe])
 AC_SUBST([RECIPES])
 
+
+AC_ARG_WITH([kickstart], [AC_HELP_STRING([--with-kickstart],
+            [Specify a kickstart file to use.  Defaults to vdsm-plugin-iso.ks])],
+            [MAIN_KS="$withval"],
+            [MAIN_KS=vdsm-plugin-iso.ks])
+AC_SUBST([MAIN_KS])
+
 AC_ARG_WITH([build_number], [AC_HELP_STRING([--with-build-number],
             [Specify a build number.])],
             [BUILD_NUMBER="$withval"],
@@ -50,7 +57,6 @@
 
 PACKAGE_NAME=ovirt-node-iso
 PRODUCT_NAME=oVirt\ Node\ Hypervisor
-MAIN_KS=ovirt-node-image.ks
 
 
 AC_CONFIG_FILES([Makefile
diff --git a/recepie-downloader.sh.in b/recepie-downloader.sh.in
index e53d674..ceb4ed3 100644
--- a/recepie-downloader.sh.in
+++ b/recepie-downloader.sh.in
@@ -7,9 +7,11 @@
 	"install")
 		sudo yum-config-manager --add-repo "http://resources.ovirt.org/pub/ovirt-$OVIRT_REPO_SUFFIX/rpm/$DISTRO_SHORT"
 		sudo yum install ovirt-node-recipe -y --nogpgcheck
+		sudo yum install ovirt-node-plugin-vdsm-recipe -y --nogpgcheck
 		;;
 	"remove")
 		sudo yum erase ovirt-node-recipe -y
+		sudo yum erase ovirt-node-plugin-vdsm-recipe -y
 		;;
 	"remove-repo")
 		sudo rm -rf /etc/yum.repos.d/resources.ovirt.org*.repo


-- 
To view, visit https://gerrit.ovirt.org/39441
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I3db401c1fb97ad013d94d24bc0c6aa4431e8d2eb
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node-iso
Gerrit-Branch: master
Gerrit-Owner: Anatoly Litovsky <tlitovsk at redhat.com>