diff options
| author |   shuai chen <chenshuai@huawei.com> | 2015-09-12 08:40:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-09-12 08:40:59 +0000 |
| commit | 86af3f1897f0cc9b1231e6cbd9e302f5daf3f64c (patch) | |
| tree | 2c955b0c27d0c4175bce21671da0ac88fc76f465 /build | |
| parent | 33bef552fb600e8f82cdfceb401337e2fa96553a (diff) | |
| parent | 6fec88cd73e388a14dcfdad812781667e5f9a668 (diff) | |
Merge "bug fix:support centos 7.1 deployment"
Diffstat (limited to 'build')
| -rwxr-xr-x | build/make_repo.sh | 2 | ||||
| -rw-r--r-- | build/templates/RedHat_juno.tmpl | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/build/make_repo.sh b/build/make_repo.sh index 1329300f..8ef3c448 100755 --- a/build/make_repo.sh +++ b/build/make_repo.sh @@ -148,7 +148,7 @@ function make_all_repo() make_repo --os-ver rhel7 --package-tag juno \ --ansible-dir $WORK_PATH/deploy/adapters/ansible \ --tmpl RedHat_juno.tmpl \ - --default-package "strace net-tools wget vim openssh-server dracut-config-rescue dracut-network" \ + --default-package "rsyslog strace net-tools wget vim openssh-server dracut-config-rescue dracut-network" \ --special-package "" } diff --git a/build/templates/RedHat_juno.tmpl b/build/templates/RedHat_juno.tmpl index a2f0fd08..1f6873bb 100644 --- a/build/templates/RedHat_juno.tmpl +++ b/build/templates/RedHat_juno.tmpl @@ -25,6 +25,16 @@ gpgkey=https://yum.mariadb.org/RPM-GPG-KEY-MariaDB gpgcheck=1 EOF +cat <<EOF >/etc/yum.repos.d/syslog.repo +[rsyslog_v7] +name=rsyslog +baseurl="http://rpms.adiscon.com/v7-stable/epel-7/x86_64" +enabled=1 +gpgcheck=0 +gpgkey=http://rpms.adiscon.com/RPM-GPG-KEY-Adiscon +protect=1 +EOF + yum update -y yum install createrepo -y yum install tar -y |