add ntp for compass-core

JIRA: COMPASS-514

add ntp for compass-core and set up timezone, make timezone
in compass-core same as where hosts' are
To set timezone of both compass-core and hosts, edit
    /deploy/conf/compass.conf
    TIMEZONE: Asia/Shanghai

Change-Id: If60623dbff793e56e65c32f80addc5e1d956f3e1
Signed-off-by: qiwei-li-huawei <qiwei.li@huawei.com>

diff --git a/deploy/compass_vm.sh b/deploy/compass_vm.sh
index 294f2be..6199371 100755 (executable)
--- a/deploy/compass_vm.sh
+++ b/deploy/compass_vm.sh
@@ -39,6 +39,7 @@ function set_compass_machine() {
 function install_compass() {
     local inventory_file=$compass_vm_dir/inventory.file
     sed -i "s/mgmt_next_ip:.*/mgmt_next_ip: ${COMPASS_SERVER}/g" $WORK_DIR/installer/compass-install/install/group_vars/all
+    sed -i "s/timezone:.*/timezone: ${TIMEZONE}/g" $WORK_DIR/installer/compass-install/install/group_vars/all
     echo "compass_nodocker ansible_ssh_host=$MGMT_IP ansible_ssh_port=22" > $inventory_file
     PYTHONUNBUFFERED=1 ANSIBLE_FORCE_COLOR=true ANSIBLE_HOST_KEY_CHECKING=false ANSIBLE_SSH_ARGS='-o UserKnownHostsFile=/dev/null -o ControlMaster=auto -o ControlPersist=60s' ansible-playbook -e pipeline=true --private-key=$rsa_file --user=root --connection=ssh --inventory-file=$inventory_file $WORK_DIR/installer/compass-install/install/$1
     exit_status=$?

diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 0bae6d3..6e38d70 100644 (file)
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -11,6 +11,6 @@ export COMPASS_EXTERNAL_IP=${COMPASS_EXTERNAL_IP:-}
 export COMPASS_EXTERNAL_MASK=${COMPASS_EXTERNAL_MASK:-}
 export COMPASS_EXTERNAL_GW=${COMPASS_EXTERNAL_GW:-}
 export LANGUAGE="EN"
-export TIMEZONE="America/Los_Angeles"
+export TIMEZONE="Asia/Shanghai"
 export NTP_SERVER="$COMPASS_SERVER"
 export NAMESERVERS="$COMPASS_SERVER"

diff --git a/repo/repo_func.sh b/repo/repo_func.sh
index 4a9e469..b13bedf 100755 (executable)
--- a/repo/repo_func.sh
+++ b/repo/repo_func.sh
@@ -347,7 +347,7 @@ function make_compass_repo()
                                  python-yaml python-jinja2 python-paramiko elasticsearch logstash bind-license vim nmap-ncat \
                                  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" \
+                                 mysql-server mysql MySQL-python redis mod_wsgi net-tools rabbitmq-server nfs-utils ntp ntpdate" \
               --special-package "kibana jdk"
 }