From e9a3235eece696c4661afb1064941337cb046b6a Mon Sep 17 00:00:00 2001 From: Thomas Schreiber Date: Tue, 28 Feb 2012 23:15:39 +0100 Subject: [PATCH 1/2] authorized_keys2 is deprecated: s/authorized_keys2/authorized_keys --- openstack/compute/shell.py | 4 ++-- tests/test_shell.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/openstack/compute/shell.py b/openstack/compute/shell.py index ea2ea80..91b7524 100644 --- a/openstack/compute/shell.py +++ b/openstack/compute/shell.py @@ -262,7 +262,7 @@ def do_boot(self, args): if keyfile: try: - files['/root/.ssh/authorized_keys2'] = open(keyfile) + files['/root/.ssh/authorized_keys'] = open(keyfile) except IOError, e: raise CommandError("Can't open '%s': %s" % (keyfile, e)) @@ -487,4 +487,4 @@ def main(): ComputeShell().main(sys.argv[1:]) except CommandError, e: print >> sys.stderr, e - sys.exit(1) \ No newline at end of file + sys.exit(1) diff --git a/tests/test_shell.py b/tests/test_shell.py index 5dbbaf5..e6eaaf4 100644 --- a/tests/test_shell.py +++ b/tests/test_shell.py @@ -104,7 +104,7 @@ def test_shell_call(): 'POST', '/servers', {'server': {'flavorId': 1, 'name': 'some-server', 'imageId': 1, 'personality': [{ - 'path': '/root/.ssh/authorized_keys2', + 'path': '/root/.ssh/authorized_keys', 'contents': ('SSHKEY').encode('base64')}, ]} } @@ -129,7 +129,7 @@ def test_boot_key_file(): 'POST', '/servers', {'server': {'flavorId': 1, 'name': 'some-server', 'imageId': 1, 'personality': [ - {'path': '/root/.ssh/authorized_keys2', 'contents': expected_file_data}, + {'path': '/root/.ssh/authorized_keys', 'contents': expected_file_data}, ]} } ) From 0e58bed406a89bc6871223d7b3987537d0eec80c Mon Sep 17 00:00:00 2001 From: Thomas Schreiber Date: Wed, 6 Jun 2012 13:11:11 +0200 Subject: [PATCH 2/2] freeze requirements because new prettytable 0.6 is incompatible --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 5784a3e..bdb7d45 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ def read(fname): return open(os.path.join(os.path.dirname(__file__), fname)).read() -requirements = ['httplib2', 'argparse', 'prettytable'] +requirements = ['httplib2==0.7.4', 'argparse==1.2.1', 'prettytable==0.5'] if sys.version_info < (2,6): requirements.append('simplejson') @@ -37,4 +37,4 @@ def read(fname): entry_points = { 'console_scripts': ['openstack-compute = openstack.compute.shell:main'] } -) \ No newline at end of file +)