summaryrefslogtreecommitdiffstats
path: root/func
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2016-10-09 06:55:39 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-10-09 06:55:39 +0000
commit7c6218b15fb704712b2bc5ccabbb3471253ff9cc (patch)
treecb579b4c30f19798496dbdcca1c929fca0bdaf4a /func
parentd54999f1aff7d154887211bf28fd1bee360e7fa2 (diff)
parentec01b0595509ea2b8838ed1caed7325e9800706f (diff)
Merge "change fetch_compute_ips.sh path"
Diffstat (limited to 'func')
-rw-r--r--func/env_setup.py4
-rwxr-xr-xfunc/fetch_compute_ips.sh117
2 files changed, 1 insertions, 120 deletions
diff --git a/func/env_setup.py b/func/env_setup.py
index f10f8620..ca83f040 100644
--- a/func/env_setup.py
+++ b/func/env_setup.py
@@ -14,10 +14,8 @@ import sys
import time
from collections import defaultdict
from os.path import expanduser
-
import paramiko
import yaml
-
from utils import logger_utils
logger = logger_utils.QtipLogger('env_setup').get
@@ -111,7 +109,7 @@ class Env_setup:
if not installer_ip:
raise RuntimeError("undefine environment variable INSTALLER_IP")
- cmd = "bash ./func/fetch_compute_ips.sh -i %s -a %s" % \
+ cmd = "bash ./data/fetch_compute_ips.sh -i %s -a %s" % \
(installer_type, installer_ip)
logger.info(cmd)
os.system(cmd)
diff --git a/func/fetch_compute_ips.sh b/func/fetch_compute_ips.sh
deleted file mode 100755
index ebe817a6..00000000
--- a/func/fetch_compute_ips.sh
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/bin/bash
-##############################################################################
-#Copyright (c) 2016 Ericsson AB, ZTE and others.
-#jose.lausuch@ericsson.com
-#wu.zhihui1@zte.com.cn
-#All rights reserved. This program and the accompanying materials
-#are made available under the terms of the Apache License, Version 2.0
-#which accompanies this distribution, and is available at
-#http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-
-usage(){
- echo "usage: $0 [-v] -i <installer_type> -a <installer_ip>" >&2
- echo "[-v] Virtualized deployment" >&2
-}
-
-info() {
- logger -s -t "fetch_compute_info.info" "$*"
-}
-
-
-error() {
- logger -s -t "fetch_compute_info.error" "$*"
- exit 1
-}
-
-verify_connectivity(){
- local ip=$1
- info "Verifying connectivity to $ip..."
- for i in $(seq 0 10); do
- if ping -c 1 -W 1 $ip > /dev/null; then
- info "$ip is reachable!"
- return 0
- fi
- sleep 1
- done
- error "Can not talk to $ip."
-}
-
-:${DEPLOY_TYPE:=''}
-
-#Getoptions
-while getopts ":i:a:h:v" optchar; do
- case "${optchar}" in
- i) installer_type=${OPTARG} ;;
- a) installer_ip=${OPTARG} ;;
- v) DEPLOY_TYPE="virt" ;;
- *) echo "Non-option argument: '-${OPTARG}'" >&2
- usage
- exit 2
- ;;
- esac
-done
-
-#set vars from env if not provided by user as options
-installer_type=${installer_type:-$INSTALLER_TYPE}
-installer_ip=${installer_ip:-$INSTALLER_IP}
-
-if [ -z $installer_type ] || [ -z $installer_ip ]; then
- usage
- exit 2
-fi
-
-ssh_options="-oUserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
-
-#Start fetching compute ip
-if [ "$installer_type" == "fuel" ]; then
- verify_connectivity $installer_ip
-
- env=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
- 'fuel env'|grep operational|head -1|awk '{print $1}') &> /dev/null
- if [ -z $env ]; then
- error "No operational environment detected in Fuel"
- fi
- env_id="${FUEL_ENV:-$env}"
-
- # Check if compute is alive (online='True')
- IPS=$(sshpass -p r00tme ssh 2>/dev/null $ssh_options root@${installer_ip} \
- "fuel node --env ${env_id} | grep compute | grep 'True\| 1' | awk -F\| '{print \$5}' " | \
- sed 's/ //g') &> /dev/null
-
-
-elif [ "$installer_type" == "apex" ]; then
- echo "not implement now"
- exit 1
-
-elif [ "$installer_type" == "compass" ]; then
- # need test
- verify_connectivity $installer_ip
- IPS=$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \
- 'mysql -ucompass -pcompass -Dcompass -e"select * from cluster;"' \
- | awk -F"," '{for(i=1;i<NF;i++)if($i~/\"host[4-5]\"/) {print $(i+1);}}' \
- | grep -oP "\d+.\d+.\d+.\d+")
-
-elif [ "$installer_type" == "joid" ]; then
- echo "not implement now"
- exit 1
-
-elif [ "$installer_type" == "foreman" ]; then
- echo "not implement now"
- exit 1
-
-else
- error "Installer $installer is not supported by this script"
-fi
-
-if [ -z "$IPS" ]; then
- error "The compute node $IPS are not up. Please check that the POD is correctly deployed."
-else
- echo "-------- all compute node ips: --------"
- touch $HOME/ips.log
- echo "$IPS" > $HOME/ips.log
- echo $IPS
-fi
-
-exit 0