diff options
| -rw-r--r-- | docs/configguide/configuration.rst | 2 | ||||
| -rw-r--r-- | qtip.py | 2 | ||||
| -rwxr-xr-x | scripts/file_permission.sh | 4 | ||||
| -rwxr-xr-x | scripts/qtip_creds.sh | 14 | ||||
| -rw-r--r-- | scripts/ref_results/index_calculation.py | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/docs/configguide/configuration.rst b/docs/configguide/configuration.rst index 5d03de04..a9bb6b1a 100644 --- a/docs/configguide/configuration.rst +++ b/docs/configguide/configuration.rst @@ -94,7 +94,7 @@ QTIP default key pair """""""""""""""""""""" QTIP uses a SSH key pair to connect to the guest image. This key pair can -be found in the ``data/`` directory. +be found in the ``config/`` directory. Hardware configuration @@ -11,7 +11,7 @@ import os def main(): - os.system('./data/file_permission.sh') + os.system('./scripts/file_permission.sh') Cli() diff --git a/scripts/file_permission.sh b/scripts/file_permission.sh index 01a77d50..a8af957e 100755 --- a/scripts/file_permission.sh +++ b/scripts/file_permission.sh @@ -1,3 +1,3 @@ #! /bin/bash -chmod 0600 data/QtipKey -chmod 0600 data/QtipKey.pub +chmod 0600 config/QtipKey +chmod 0600 config/QtipKey.pub diff --git a/scripts/qtip_creds.sh b/scripts/qtip_creds.sh index beb4659f..94d9133c 100755 --- a/scripts/qtip_creds.sh +++ b/scripts/qtip_creds.sh @@ -1,4 +1,4 @@ -#! /bin/bash +! /bin/bash DEST_IP=$1 echo $INSTALLER_TYPE @@ -6,21 +6,21 @@ echo $INSTALLER_IP sshoptions="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null" case "$INSTALLER_TYPE" in apex) - scp $sshoptions -i $APEX_KEY ./data/QtipKey.pub stack@$INSTALLER_IP:/home/stack - scp $sshoptions -i $APEX_KEY ./data/QtipKey stack@$INSTALLER_IP:/home/stack + 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" ;; fuel) PSWD="r00tme" - sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root - sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/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 "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" ;; compass) PSWD="root" - sshpass -p $PSWD scp $sshoptions ./data/QtipKey.pub root@$INSTALLER_IP:/root - sshpass -p $PSWD scp $sshoptions ./data/QtipKey root@$INSTALLER_IP:/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" ;; joid) diff --git a/scripts/ref_results/index_calculation.py b/scripts/ref_results/index_calculation.py index 5ca4a46e..4ead79ff 100644 --- a/scripts/ref_results/index_calculation.py +++ b/scripts/ref_results/index_calculation.py @@ -13,7 +13,7 @@ def compute_index(total_measured, ref_result, count): def get_reference(*args): - with open('data/ref_results/reference.json') as reference_file: + with open('scripts/ref_results/reference.json') as reference_file: reference_djson = json.load(reference_file) for arg in args: ref_n = reference_djson.get(str(arg)) |