summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2017-09-07 11:22:52 +0200
committerMorgan Richomme <morgan.richomme@orange.com>2017-09-07 14:34:54 +0200
commitb2855ee0fedb344dad0c393f2a4ec6a7109eec27 (patch)
tree314deb21b55dee7e9b8fdbd935c5981289dc4dbb
parent20b31307c730a6561107dba6299d3a47dd4c3090 (diff)
Add traces to CI on fetch_os for compass
Functest CI logs have been FAIL with compass but the CI logs are not explicit. Remove a redirection to /dev/null to get something more explicit Change-Id: Icdf17595b051ccba6c58cbe86ab546e5693375ab Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>
-rwxr-xr-xutils/fetch_os_creds.sh13
1 files changed, 7 insertions, 6 deletions
diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh
index 0e2a2b93f..54b2b45df 100755
--- a/utils/fetch_os_creds.sh
+++ b/utils/fetch_os_creds.sh
@@ -95,6 +95,7 @@ fi
ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
# Start fetching the files
+info "Fetching rc file..."
if [ "$installer_type" == "fuel" ]; then
verify_connectivity $installer_ip
if [ "${BRANCH}" == "master" ]; then
@@ -110,7 +111,7 @@ if [ "$installer_type" == "fuel" ]; then
"sudo salt --out txt 'ctl*' pillar.get _param:openstack_control_address | awk '{print \$2; exit}'" | \
sed 's/ //g') &> /dev/null
- info "Fetching rc file from controller $controller_ip..."
+ info "... from controller $controller_ip..."
ssh ${ssh_options} ubuntu@${controller_ip} "sudo cat /root/keystonercv3" > $dest_path
if [[ $BUILD_TAG =~ "baremetal" ]]; then
@@ -134,7 +135,7 @@ if [ "$installer_type" == "fuel" ]; then
error "The controller $controller_ip is not up. Please check that the POD is correctly deployed."
fi
- info "Fetching rc file from controller $controller_ip..."
+ info "... from controller $controller_ip..."
sshpass -p r00tme ssh 2>/dev/null ${ssh_options} root@${installer_ip} \
"scp ${ssh_options} ${controller_ip}:/root/openrc ." &> /dev/null
sshpass -p r00tme scp 2>/dev/null ${ssh_options} root@${installer_ip}:~/openrc $dest_path &> /dev/null
@@ -159,7 +160,7 @@ elif [ "$installer_type" == "apex" ]; then
# The credentials file is located in the Instack VM (192.0.2.1)
# NOTE: This might change for bare metal deployments
- info "Fetching rc file from Instack VM $installer_ip..."
+ info "... from Instack VM $installer_ip..."
if [ -f /root/.ssh/id_rsa ]; then
chmod 600 /root/.ssh/id_rsa
fi
@@ -169,7 +170,7 @@ elif [ "$installer_type" == "compass" ]; then
if [ "${BRANCH}" == "master" ]; then
sudo docker cp compass-tasks:/opt/openrc $dest_path &> /dev/null
sudo chown $(whoami):$(whoami) $dest_path
- sudo docker cp compass-tasks:/opt/os_cacert $os_cacert &> /dev/null
+ sudo docker cp compass-tasks:/opt/os_cacert $os_cacert
else
verify_connectivity $installer_ip
controller_ip=$(sshpass -p'root' ssh 2>/dev/null $ssh_options root@${installer_ip} \
@@ -181,7 +182,7 @@ elif [ "$installer_type" == "compass" ]; then
error "The controller $controller_ip is not up. Please check that the POD is correctly deployed."
fi
- info "Fetching rc file from controller $controller_ip..."
+ info "... from controller $controller_ip..."
sshpass -p root ssh 2>/dev/null $ssh_options root@${installer_ip} \
"scp $ssh_options ${controller_ip}:/opt/admin-openrc.sh ." &> /dev/null
sshpass -p root scp 2>/dev/null $ssh_options root@${installer_ip}:~/admin-openrc.sh $dest_path &> /dev/null
@@ -205,7 +206,7 @@ elif [ "$installer_type" == "compass" ]; then
elif [ "$installer_type" == "joid" ]; then
# do nothing...for the moment
# we can either do a scp from the jumphost or use the -v option to transmit the param to the docker file
- echo "Do nothing, creds will be provided through volume option at docker creation for joid"
+ info "Do nothing, creds will be provided through volume option at docker creation for joid"
elif [ "$installer_type" == "foreman" ]; then
#ip_foreman="172.30.10.73"