From 9037b62da8598f9cb73c9203c3a01d8afbfd6173 Mon Sep 17 00:00:00 2001 From: "chenshuai@huawei.com" Date: Fri, 16 Oct 2015 18:59:06 +0800 Subject: bugfix:modify COMPASS_SERVER as MGMT_IP in deploy_host.sh JIRA: COMPASS-106 Change-Id: Ibcc0b5dc23c9c5c5e18faf99f40ff4652b10c3af Signed-off-by: chenshuai@huawei.com --- deploy/conf/compass.conf | 1 + deploy/deploy_host.sh | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf index eee23e9f..65f97a93 100644 --- a/deploy/conf/compass.conf +++ b/deploy/conf/compass.conf @@ -2,6 +2,7 @@ export COMPASS_VIRT_CPUS=4 export COMPASS_VIRT_MEM=4096 export COMPASS_SERVER=$INSTALL_IP export COMPASS_SERVER_URL="http://$COMPASS_SERVER/api" +export HTTP_SERVER_URL="http://$MGMT_IP/api" export COMPASS_USER_EMAIL="admin@huawei.com" export COMPASS_USER_PASSWORD="admin" export COMPASS_DNS1=${COMPASS_DNS1:-'8.8.8.8'} diff --git a/deploy/deploy_host.sh b/deploy/deploy_host.sh index 2ec7b8c8..a055702e 100644 --- a/deploy/deploy_host.sh +++ b/deploy/deploy_host.sh @@ -3,12 +3,12 @@ function deploy_host(){ NEUTRON_FILE=${COMPASS_DIR}/deploy/conf/neutron_cfg.yaml pip install oslo.config - ssh $ssh_args root@${COMPASS_SERVER} mkdir -p /opt/compass/bin/ansible_callbacks - scp $ssh_args -r ${COMPASS_DIR}/deploy/status_callback.py root@${COMPASS_SERVER}:/opt/compass/bin/ansible_callbacks/status_callback.py + ssh $ssh_args root@${MGMT_IP} mkdir -p /opt/compass/bin/ansible_callbacks + scp $ssh_args -r ${COMPASS_DIR}/deploy/status_callback.py root@${MGMT_IP}:/opt/compass/bin/ansible_callbacks/status_callback.py reboot_hosts - python ${COMPASS_DIR}/deploy/client.py --compass_server="${COMPASS_SERVER_URL}" \ + python ${COMPASS_DIR}/deploy/client.py --compass_server="${HTTP_SERVER_URL}" \ --compass_user_email="${COMPASS_USER_EMAIL}" --compass_user_password="${COMPASS_USER_PASSWORD}" \ --cluster_name="${CLUSTER_NAME}" --language="${LANGUAGE}" --timezone="${TIMEZONE}" \ --hostnames="${HOSTNAMES}" --partitions="${PARTITIONS}" --subnets="${SUBNETS}" \ -- cgit 1.2.3-korg