diff options
author | zhihui wu <zhihui.wu2006+zte@gmail.com> | 2017-03-01 01:11:22 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2017-03-01 01:11:22 +0000 |
commit | 7f5d4f59f12920bc7ab226d7b20048e28a99575f (patch) | |
tree | 9e90762d2fb8510531a5f90f7e66c6860663009b /qtip/scripts | |
parent | d0441a8775473a942c0c6077b3a4e5ca35adeb2b (diff) | |
parent | 63e07fce71ad5f4a0b992a8583a5347e6e0aba1b (diff) |
Merge "refactor code related with setup env"
Diffstat (limited to 'qtip/scripts')
-rwxr-xr-x | qtip/scripts/generate_host_file.sh (renamed from qtip/scripts/fetch_compute_ips.sh) | 16 | ||||
-rwxr-xr-x | qtip/scripts/qtip_creds.sh | 24 |
2 files changed, 23 insertions, 17 deletions
diff --git a/qtip/scripts/fetch_compute_ips.sh b/qtip/scripts/generate_host_file.sh index a2618ec9..1353cacd 100755 --- a/qtip/scripts/fetch_compute_ips.sh +++ b/qtip/scripts/generate_host_file.sh @@ -10,17 +10,17 @@ usage(){ - echo "usage: $0 [-v] -i <installer_type> -a <installer_ip>" >&2 + echo "usage: $0 [-v] -i <installer_type> -a <installer_ip> -d <host_file>" >&2 echo "[-v] Virtualized deployment" >&2 } info() { - logger -s -t "fetch_compute_info.info" "$*" + logger -s -t "generate_host_file.info" "$*" } error() { - logger -s -t "fetch_compute_info.error" "$*" + logger -s -t "generate_host_file.error" "$*" exit 1 } @@ -44,6 +44,7 @@ while getopts ":i:a:h:v" optchar; do case "${optchar}" in i) installer_type=${OPTARG} ;; a) installer_ip=${OPTARG} ;; + d) host_file=${OPTARG} ;; v) DEPLOY_TYPE="virt" ;; *) echo "Non-option argument: '-${OPTARG}'" >&2 usage @@ -108,10 +109,11 @@ 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: --------" - rm $HOME/ips.log - touch $HOME/ips.log - echo "$IPS" > $HOME/qtip/ips.log - echo $IPS + rm $host_file + touch $host_file + echo "[hosts]" >> $host_file + echo "$IPS" >> $host_file + cat $host_file fi exit 0 diff --git a/qtip/scripts/qtip_creds.sh b/qtip/scripts/qtip_creds.sh index af051ac5..d338115f 100755 --- a/qtip/scripts/qtip_creds.sh +++ b/qtip/scripts/qtip_creds.sh @@ -1,30 +1,34 @@ #! /bin/bash DEST_IP=$1 +PRIVATE_KEY=$2 +PUBLIC_KEY=$2.pub +KEYNAME=$(basename PRIVATE_KEY) + echo $INSTALLER_TYPE echo $INSTALLER_IP sshoptions="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" case "$INSTALLER_TYPE" in apex) - scp $sshoptions -i $APEX_KEY ./config/QtipKey.pub stack@$INSTALLER_IP:/home/stack - scp $sshoptions -i $APEX_KEY ./config/QtipKey stack@$INSTALLER_IP:/home/stack - ssh $sshoptions -i $APEX_KEY stack@$INSTALLER_IP "ssh-copy-id $sshoptions -i /home/stack/QtipKey.pub heat-admin@$DEST_IP && rm -rf /home/stack/QtipKey && rm -rf /home/stack/QtipKey.pub" + scp $sshoptions -i $APEX_KEY $PUBLIC_KEY stack@$INSTALLER_IP:/home/stack + scp $sshoptions -i $APEX_KEY $PRIVATE_KEY stack@$INSTALLER_IP:/home/stack + ssh $sshoptions -i $APEX_KEY stack@$INSTALLER_IP "ssh-copy-id $sshoptions -i /home/stack/$KEYNAME.pub heat-admin@$DEST_IP && rm -rf /home/stack/$KEYNAME && rm -rf /home/stack/$KEYNAME.pub" ;; fuel) PSWD="r00tme" - sshpass -p $PSWD scp $sshoptions ./config/QtipKey.pub root@$INSTALLER_IP:/root - sshpass -p $PSWD scp $sshoptions ./config/QtipKey root@$INSTALLER_IP:/root + sshpass -p $PSWD scp $sshoptions $PUBLIC_KEY root@$INSTALLER_IP:/root + sshpass -p $PSWD scp $sshoptions $PRIVATE_KEY root@$INSTALLER_IP:/root sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "grep -q '\-F /dev/null ' /usr/bin/ssh-copy-id || sed -i 's/\(ssh -i.*$\)/\1\n -F \/dev\/null \\\/g' `which ssh-copy-id`" - sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub" + sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/$KEYNAME root@$DEST_IP && rm -rf /root/$KEYNAME && rm -rf /root/$KEYNAME.pub" ;; compass) PSWD="root" - sshpass -p $PSWD scp $sshoptions ./config/QtipKey.pub root@$INSTALLER_IP:/root - sshpass -p $PSWD scp $sshoptions ./config/QtipKey root@$INSTALLER_IP:/root - sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/QtipKey.pub root@$DEST_IP && rm -rf /root/QtipKey && rm -rf /root/QtipKey.pub" + sshpass -p $PSWD scp $sshoptions $PUBLIC_KEY root@$INSTALLER_IP:/root + sshpass -p $PSWD scp $sshoptions $PRIVATE_KEY root@$INSTALLER_IP:/root + sshpass -p $PSWD ssh $sshoptions root@$INSTALLER_IP "ssh-copy-id $sshoptions -i /root/$KEYNAME.pub root@$DEST_IP && rm -rf /root/$KEYNAME && rm -rf /root/$KEYNAME.pub" ;; joid) PSWD="joid";; *) echo "Unkown installer $INSTALLER_TYPE specified";; -esac +esac
\ No newline at end of file |