From 99909276427c5f665e083ae48cdd889724dba5d3 Mon Sep 17 00:00:00 2001
From: zhaoxinyu <zhaoxinyu@huawei.com>
Date: Wed, 2 Apr 2014 22:51:24 +0000
Subject: [PATCH] Install a new version of rsyslog
Some bugs are fixed in the new version. Hoping
the new version will fix the chef log syncing problem
after rsyslog restart.
Change-Id: I592638553bd42b8ef2b57bd3feba75dc3d4506eb
---
install/cobbler.sh | 11 +++++++++++
install/prepare.sh | 9 +++++++++
2 files changed, 20 insertions(+)
diff --git a/install/cobbler.sh b/install/cobbler.sh
index cf5c315a..c6a7671d 100755
--- a/install/cobbler.sh
+++ b/install/cobbler.sh
@@ -209,6 +209,17 @@ do
sudo cp /tmp/$f /var/lib/cobbler/repo_mirror/ppa_repo/
done
+ppa_repo_rsyslog_packages="json-c-0.10-2.el6.$IMAGE_ARCH.rpm
+ libestr-0.1.9-1.el6.$IMAGE_ARCH.rpm
+ libgt-0.3.11-1.el6.$IMAGE_ARCH.rpm
+ liblogging-1.0.4-1.el6.$IMAGE_ARCH.rpm
+ rsyslog-7.6.3-1.el6.$IMAGE_ARCH.rpm"
+for f in $ppa_repo_rsyslog_packages
+do
+ download http://rpms.adiscon.com/v7-stable/epel-6/${IMAGE_ARCH}/RPMS/$f $f
+ sudo cp /tmp/$f /var/lib/cobbler/repo_mirror/ppa_repo/
+done
+
# download chef client for ppa repo
download http://opscode-omnibus-packages.s3.amazonaws.com/el/${IMAGE_VERSION_MAJOR}/${IMAGE_ARCH}/chef-11.8.0-1.el6.${IMAGE_ARCH}.rpm
sudo cp /tmp/chef-11.8.0-1.el6.${IMAGE_ARCH}.rpm /var/lib/cobbler/repo_mirror/ppa_repo/
diff --git a/install/prepare.sh b/install/prepare.sh
index e4cef4a9..0635d1fe 100755
--- a/install/prepare.sh
+++ b/install/prepare.sh
@@ -157,6 +157,15 @@ for f in $ppa_repo_packages
do
download ftp://rpmfind.net/linux/${IMAGE_TYPE,,}/${IMAGE_VERSION_MAJOR}/os/${IMAGE_ARCH}/Packages/$f $f
done
+ppa_repo_rsyslog_packages="json-c-0.10-2.el6.$IMAGE_ARCH.rpm
+ libestr-0.1.9-1.el6.$IMAGE_ARCH.rpm
+ libgt-0.3.11-1.el6.$IMAGE_ARCH.rpm
+ liblogging-1.0.4-1.el6.$IMAGE_ARCH.rpm
+ rsyslog-7.6.3-1.el6.$IMAGE_ARCH.rpm"
+for f in $ppa_repo_rsyslog_packages
+do
+ download http://rpms.adiscon.com/v7-stable/epel-6/${IMAGE_ARCH}/RPMS/$f $f
+done
# download chef client for ppa repo
download http://opscode-omnibus-packages.s3.amazonaws.com/el/${IMAGE_VERSION_MAJOR}/${IMAGE_ARCH}/chef-11.8.0-1.el6.${IMAGE_ARCH}.rpm