Skip to content

Commit 9019f0d

Browse files
author
Matthew Fisher
committed
added nova client fo uploading SSH keys
1 parent 7de5caf commit 9019f0d

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

contrib/rackspace/provision-rackspace-controller.sh

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ if ! "$CONTRIB_DIR/check-deis-deps.sh"; then
2121
exit 1
2222
fi
2323

24-
# check for knife-rackspace
25-
if ! knife rackspace server list > /dev/null; then
26-
echo 'Please install the knife-rackspace Ruby gem and configure knife.rb.'
24+
if ! nova --version > /dev/null 2>&1; then
25+
echo "Please install nova using 'pip install python-novaclient'."
2726
exit 1
2827
fi
2928

@@ -74,7 +73,10 @@ fi
7473

7574
# upload the user's SSH key to Rackspace.
7675
# if it fails, that means that it's already been uploaded.
77-
nova keypair-add --pub-key $ssh_key_path.pub deis > /dev/null 2>&1
76+
echo "uploading keypair to Rackspace, please wait"
77+
if ! nova keypair-add --pub-key $ssh_key_path.pub deis > /dev/null; then
78+
echo "keypair already uploaded to Rackspace. Skipping."
79+
fi
7880

7981
# create data bags
8082
knife data bag create deis-formations 2>/dev/null

0 commit comments

Comments
 (0)