[node-patches] Change in ovirt-node-iso[node-3.0]: Add some addtional repositories and config options
mburns at redhat.com
mburns at redhat.com
Fri Jul 26 14:58:01 UTC 2013
Michael Burns has uploaded a new change for review.
Change subject: Add some addtional repositories and config options
......................................................................
Add some addtional repositories and config options
MANAGEMENT to optionally enable ovirt repos
also add gluster repos for gluster 6.4 on el6
Change-Id: I75279cedaad165b1c60c862bdb86842d48019289
Signed-off-by: Mike Burns <mburns at redhat.com>
---
M Makefile.am
1 file changed, 43 insertions(+), 10 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-node-iso refs/changes/39/17339/1
diff --git a/Makefile.am b/Makefile.am
index 7812e39..9665d95 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,6 +21,7 @@
PRODUCT = @PRODUCT_NAME@
PRODUCT_SHORT ?= $(PRODUCT)
PKG_FMT = iso
+MANAGEMENT ?= NONE
FEDORA = @FEDORA@
RHEL = @RHEL@
DISTRO = @DISTRO@
@@ -53,7 +54,12 @@
NODE_CREATOR = $(shell ( test -e $(RECIPE_DIR)/node-creator && echo "$(RECIPE_DIR)/node-creator" ) || ( test -e node-creator && echo "./node-creator" ) || which node-creator 2>/dev/null)
FEDORA_MIRROR = http://mirrors.fedoraproject.org/mirrorlist
-OVIRT_BASE_URL = http://ovirt.org/releases/node-base
+OVIRT_BASE_URL = http://ovirt.org/releases/
+NODE_BASE_URL = $(OVIRT_BASE_URL)/node-base
+NODE_URL = $(NODE_BASE_URL)/stable/rpm
+NODE_NIGHTLY_URL = $(NODE_BASE_URL)/nightly/rpm
+NODE_BETA_URL = $(NODE_BASE_URL)/beta/rpm
+NODE_ALPHA_URL = $(NODE_BASE_URL)/alpha/rpm
OVIRT_URL = $(OVIRT_BASE_URL)/stable/rpm
OVIRT_NIGHTLY_URL = $(OVIRT_BASE_URL)/nightly/rpm
OVIRT_BETA_URL = $(OVIRT_BASE_URL)/beta/rpm
@@ -104,6 +110,11 @@
OVIRT_NIGHTLY_REPO_LINE="repo --name=ovirt-nightly-repo --baseurl=$(OVIRT_NIGHTLY_URL)/EL/$(CENTOS_RELEASE)\n" ;\
OVIRT_BETA_REPO_LINE="repo --name=ovirt-beta-repo --baseurl=$(OVIRT_BETA_URL)/EL/$(CENTOS_RELEASE)\n" ;\
OVIRT_ALPHA_REPO_LINE="repo --name=ovirt-alpha-repo --baseurl=$(OVIRT_ALPHA_URL)/EL/$(CENTOS_RELEASE)\n" ;\
+ NODE_STABLE_REPO_LINE="repo --name=node-stable-repo --baseurl=$(NODE_URL)/EL/$(CENTOS_RELEASE)\n" ;\
+ NODE_NIGHTLY_REPO_LINE="repo --name=node-nightly-repo --baseurl=$(NODE_NIGHTLY_URL)/EL/$(CENTOS_RELEASE)\n" ;\
+ NODE_BETA_REPO_LINE="repo --name=node-beta-repo --baseurl=$(NODE_BETA_URL)/EL/$(CENTOS_RELEASE)\n" ;\
+ NODE_ALPHA_REPO_LINE="repo --name=node-alpha-repo --baseurl=$(NODE_ALPHA_URL)/EL/$(CENTOS_RELEASE)\n" ;\
+ GLUSTER_REPO_LINE="repo --name=gluster-3.4 --baseurl=http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/CentOS/epel-6Server/x86_64/\n" ;\
echo "$${CENTOS_REPO_LINE}" > repos.ks ;\
echo "$${UPDATES_REPO_LINE}" >> repos.ks ;\
echo "$${EPEL_REPO_LINE}" >> repos.ks ;\
@@ -112,6 +123,10 @@
OVIRT_NIGHTLY_REPO_LINE="repo --name=ovirt-nightly-repo --baseurl=$(OVIRT_NIGHTLY_URL)/Fedora/$(FEDORA)\n" ;\
OVIRT_BETA_REPO_LINE="repo --name=ovirt-beta-repo --baseurl=$(OVIRT_BETA_URL)/Fedora/$(FEDORA)\n" ;\
OVIRT_ALPHA_REPO_LINE="repo --name=ovirt-alpha-repo --baseurl=$(OVIRT_ALPHA_URL)/Fedora/$(FEDORA)\n" ;\
+ NODE_STABLE_REPO_LINE="repo --name=node-stable-repo --baseurl=$(NODE_URL)/Fedora/$(FEDORA)\n" ;\
+ NODE_NIGHTLY_REPO_LINE="repo --name=node-nightly-repo --baseurl=$(NODE_NIGHTLY_URL)/Fedora/$(FEDORA)\n" ;\
+ NODE_BETA_REPO_LINE="repo --name=node-beta-repo --baseurl=$(NODE_BETA_URL)/Fedora/$(FEDORA)\n" ;\
+ NODE_ALPHA_REPO_LINE="repo --name=node-alpha-repo --baseurl=$(NODE_ALPHA_URL)/Fedora/$(FEDORA)\n" ;\
if [ 0$(FEDORA) == 0$(CUR_RAWHIDE) ]; then \
FEDORA_REPO=rawhide ;\
FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/development/rawhide/$(ARCH)/os,--mirrorlist=$(FEDORA_MIRROR)?repo=rawhide&arch=$(ARCH))" ;\
@@ -119,33 +134,51 @@
FEDORA_REPO=f$(FEDORA) ;\
FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/development/$(FEDORA)/$(ARCH)/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\
UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates-testing $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/testing/$(FEDORA)/${ARCH},--mirrorlist=$(FEDORA_MIRROR)?repo=updates-testing-f$(FEDORA)&arch=$(ARCH))\n" ;\
+ GLUSTER_REPO_LINE="repo --name=gluster-3.4 --baseurl=http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/Fedora/fedora-$(FEDORA)/x86_64/\n" ;\
VIRT_PREVIEW_LINE="repo --name=$${FEDORA_REPO}-virt-preview --baseurl=$(VIRT_PREVIEW)/fedora-$(FEDORA)/$(ARCH)\n" ;\
else \
FEDORA_REPO=f$(FEDORA) ;\
FEDORA_REPO_LOC="$(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/releases/$(FEDORA)/Everything/${ARCH}/os,--mirrorlist=$(FEDORA_MIRROR)?repo=fedora-$(FEDORA)&arch=$(ARCH))" ;\
UPDATE_REPO_LINE="repo --name=$${FEDORA_REPO}-updates $(if $(FEDORA_URL),--baseurl=$(FEDORA_URL)/updates/$(FEDORA)/${ARCH},--mirrorlist=$(FEDORA_MIRROR)?repo=updates-released-f$(FEDORA)&arch=$(ARCH))\n" ;\
+ GLUSTER_REPO_LINE="repo --name=gluster-3.4 --baseurl=http://download.gluster.org/pub/gluster/glusterfs/3.4/3.4.0/Fedora/fedora-$(FEDORA)/x86_64/\n" ;\
VIRT_PREVIEW_LINE="repo --name=$${FEDORA_REPO}-virt-preview --baseurl=$(VIRT_PREVIEW)/fedora-$(FEDORA)/$(ARCH)\n" ;\
fi ;\
echo "repo --name=$${FEDORA_REPO} $${FEDORA_REPO_LOC}" > repos.ks ;\
printf "$${UPDATE_REPO_LINE}" >> repos.ks ;\
printf "$${VIRT_PREVIEW_LINE}" >> repos.ks ;\
else \
- echo "# OVIRT_REPO_URL=$(OVIRT_REPO_URL)" > $@ ;\
- for repo in $(OVIRT_REPO_URL); do \
+ echo "# NODE_REPO_URL=$(NODE_REPO_URL)" > $@ ;\
+ for repo in $(NODE_REPO_URL); do \
echo "repo --name=repo$${i} --baseurl=$${repo}" >> $@ ;\
i=$${i}_ ;\
done ;\
fi ;\
- printf "$${OVIRT_STABLE_REPO_LINE}" >> repos.ks ;\
+ printf "$${NODE_STABLE_REPO_LINE}" >> repos.ks ;\
+ printf "$${GLUSTER_REPO_LINE}" >> repos.ks ;\
+ if [ "$${MANAGEMENT}" == "OVIRT" ]; then \
+ printf "$${OVIRT_STABLE_REPO_LINE}" >> repos.ks ;\
+ fi ;\
if [ "$${BUILD_TYPE}" == "NIGHTLY" ]; then \
- printf "$${OVIRT_NIGHTLY_REPO_LINE}" >> repos.ks ;\
- printf "$${OVIRT_ALPHA_REPO_LINE}" >> repos.ks ;\
- printf "$${OVIRT_BETA_REPO_LINE}" >> repos.ks ;\
+ if [ "$${MANAGEMENT}" == "OVIRT" ]; then \
+ printf "$${OVIRT_NIGHTLY_REPO_LINE}" >> repos.ks ;\
+ printf "$${OVIRT_ALPHA_REPO_LINE}" >> repos.ks ;\
+ printf "$${OVIRT_BETA_REPO_LINE}" >> repos.ks ;\
+ fi ;\
+ printf "$${NODE_NIGHTLY_REPO_LINE}" >> repos.ks ;\
+ printf "$${NODE_ALPHA_REPO_LINE}" >> repos.ks ;\
+ printf "$${NODE_BETA_REPO_LINE}" >> repos.ks ;\
elif [ "$${BUILD_TYPE}" == "ALPHA" ]; then \
- printf "$${OVIRT_BETA_REPO_LINE}" >> repos.ks ;\
- printf "$${OVIRT_ALPHA_REPO_LINE}" >> repos.ks ;\
+ if [ "$${MANAGEMENT}" == "OVIRT" ]; then \
+ printf "$${OVIRT_ALPHA_REPO_LINE}" >> repos.ks ;\
+ printf "$${OVIRT_BETA_REPO_LINE}" >> repos.ks ;\
+ fi ;\
+ printf "$${NODE_BETA_REPO_LINE}" >> repos.ks ;\
+ printf "$${NODE_ALPHA_REPO_LINE}" >> repos.ks ;\
elif [ "$${BUILD_TYPE}" == "BETA" ]; then \
- printf "$${OVIRT_BETA_REPO_LINE}" >> repos.ks ;\
+ if [ "$${MANAGEMENT}" == "OVIRT" ]; then \
+ printf "$${OVIRT_BETA_REPO_LINE}" >> repos.ks ;\
+ fi ;\
+ printf "$${NODE_BETA_REPO_LINE}" >> repos.ks ;\
fi ;\
)
--
To view, visit http://gerrit.ovirt.org/17339
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I75279cedaad165b1c60c862bdb86842d48019289
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node-iso
Gerrit-Branch: node-3.0
Gerrit-Owner: Michael Burns <mburns at redhat.com>
More information about the node-patches
mailing list