install compass-core in centos7

JIRA: COMPASS-208

Change-Id: Ie98615df37115beaa0ad8f744cc87162452af751
Signed-off-by: baigk <baiguoku@huawei.com>

1 files changed, 10 insertions, 32 deletions

diff --git a/build/make_repo.sh b/build/make_repo.sh
index c4afd4fa..f5c78d40 100755
--- a/build/make_repo.sh
+++ b/build/make_repo.sh
@@ -23,24 +23,6 @@ set -ex
 cp /*.tar.gz /result -f
 EOF
 
-cat << EOF >${WORK_PATH}/work/repo/elasticsearch.repo
-[elasticsearch-2.x]
-name=Elasticsearch repository for 2.x packages
-baseurl=http://packages.elastic.co/elasticsearch/2.x/centos
-gpgcheck=1
-gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
-enabled=1
-EOF
-
-cat << EOF > ${WORK_PATH}/work/repo/logstash.repo
-[logstash-2.0]
-name=Logstash repository for 2.0.x packages
-baseurl=http://packages.elastic.co/logstash/2.0/centos
-gpgcheck=1
-gpgkey=http://packages.elastic.co/GPG-KEY-elasticsearch
-enabled=1
-EOF
-
     sudo apt-get install python-yaml -y
     sudo apt-get install python-cheetah -y
 }
@@ -179,9 +161,13 @@ function make_all_repo()
 {
     make_repo --package-tag pip
 
-    make_repo --os-ver rhel6 --package-tag compass \
+    make_repo --os-ver rhel7 --package-tag compass \
               --tmpl "${WORK_PATH}/build/templates/compass_core.tmpl" \
-              --default-package "epel-release python-yaml python-jinja2 python-paramiko elasticsearch logstash" \
+              --default-package "kernel-devel epel-release wget libxml2 glibc gcc perl openssl-libs mkisofs createrepo \
+                                 python-yaml python-jinja2 python-paramiko elasticsearch logstash bind-license \
+                                 yum cobbler cobbler-web createrepo mkisofs syslinux pykickstart bind rsync fence-agents \
+                                 dhcp xinetd tftp-server httpd libselinux-python python-setuptools python-devel mysql-devel \
+                                 mysql-server mysql MySQL-python redis mod_wsgi net-tools rabbitmq-server nfs-utils" \
               --special-package "kibana jdk"
 
     make_repo --os-ver trusty --package-tag juno \
@@ -201,11 +187,13 @@ function make_all_repo()
 
     make_repo --os-ver rhel7 --package-tag juno \
               --ansible-dir $WORK_PATH/deploy/adapters/ansible \
-              --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3"
+              --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \
+                                 dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3"
 
     make_repo --os-ver rhel7 --package-tag kilo \
               --ansible-dir $WORK_PATH/deploy/adapters/ansible \
-              --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server dracut-config-rescue-033-241.el7_1.5 dracut-network-033-241.el7_1.5"
+              --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server \
+                                 dracut-config-rescue-033-241.el7_1.5 dracut-network-033-241.el7_1.5"
 }
 
 function main()
@@ -214,16 +202,6 @@ function main()
 
     if [[ $# -eq 0 ]]; then
         make_all_repo
-    elif [ "$1" = "rhel7" ]; then
-        echo "make rhel7"
-        make_repo --os-ver rhel7 --package-tag juno \
-                  --ansible-dir $WORK_PATH/deploy/adapters/ansible \
-                  --default-package "rsyslog-7.6.7-1.el7 strace net-tools wget vim openssh-server dracut-config-rescue-033-241.el7_1.3 dracut-network-033-241.el7_1.3"
-    elif [ "$1" = "rhel6" ]; then
-        make_repo --os-ver rhel6 --package-tag compass \
-              --tmpl "${WORK_PATH}/build/templates/compass_core.tmpl" \
-              --default-package "epel-release python-yaml python-jinja2 python-paramiko elasticsearch logstash" \
-              --special-package "kibana jdk"
     else
         make_repo $*
     fi