From 6dbd6590984391d09b57092bce552125aa2ba8b8 Mon Sep 17 00:00:00 2001 From: Loic Dachary Date: Mon, 7 Mar 2016 16:30:26 +0700 Subject: [PATCH] openstack: setup ceph-workbench credentials Signed-off-by: Loic Dachary --- teuthology/openstack/setup-openstack.sh | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/teuthology/openstack/setup-openstack.sh b/teuthology/openstack/setup-openstack.sh index b6647bb215..850514393c 100755 --- a/teuthology/openstack/setup-openstack.sh +++ b/teuthology/openstack/setup-openstack.sh @@ -309,10 +309,17 @@ function setup_ceph_workbench() { if test "$url" ; then git clone -b $branch $url cd ceph-workbench - python setup.py install + pip install -e . + echo "INSTALLED ceph-workbench from $url" else pip install ceph-workbench + echo "INSTALLED ceph-workbench from pypi" fi + mkdir -p ~/.ceph-workbench + chmod 700 ~/.ceph-workbench + cp -a $HOME/openrc.sh ~/.ceph-workbench + cp -a $HOME/.ssh/id_rsa ~/.ceph-workbench/teuthology.pem + echo "RESET ceph-workbench credentials (key & OpenStack)" ) } @@ -617,14 +624,14 @@ function main() { setup_crontab || return 1 fi - if $do_ceph_workbench ; then - setup_ceph_workbench $ceph_workbench_git_url $ceph_workbench_branch || return 1 - fi - if $do_setup_keypair ; then get_or_create_keypair $keypair || return 1 fi + if $do_ceph_workbench ; then + setup_ceph_workbench $ceph_workbench_git_url $ceph_workbench_branch || return 1 + fi + if $do_setup_docker ; then setup_docker || return 1 fi -- 2.39.5