From 7da94123148033d1e3013c08a98a688646c63186 Mon Sep 17 00:00:00 2001 From: Chris Donati Date: Wed, 26 Sep 2018 11:55:52 -0700 Subject: [PATCH 1/2] Use the correct variable when populating keys --- appscale/tools/agents/gce_agent.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/appscale/tools/agents/gce_agent.py b/appscale/tools/agents/gce_agent.py index 098a7fb7..a4a5afd7 100644 --- a/appscale/tools/agents/gce_agent.py +++ b/appscale/tools/agents/gce_agent.py @@ -354,7 +354,6 @@ def create_ssh_key(self, parameters, all_ssh_keys): all_ssh_keys: A str that contains all of the SSH keys that are currently passed in to GCE instances. """ - our_public_ssh_key = None public_ssh_key_location = LocalState.LOCAL_APPSCALE_PATH + \ parameters[self.PARAM_KEYNAME] + ".pub" with open(public_ssh_key_location) as file_handle: @@ -366,7 +365,7 @@ def create_ssh_key(self, parameters, all_ssh_keys): if all_ssh_keys: new_all_ssh_keys = our_public_ssh_keys + "\n" + all_ssh_keys else: - new_all_ssh_keys = our_public_ssh_key + new_all_ssh_keys = our_public_ssh_keys gce_service, credentials = self.open_connection(parameters) http = httplib2.Http() From 166bfefc9da6455a7e15b45a853261e27b8115ac Mon Sep 17 00:00:00 2001 From: Steven Graham <1858109+scragraham@users.noreply.github.com> Date: Thu, 27 Sep 2018 16:10:52 -0500 Subject: [PATCH 2/2] version bump to 3.6.1 --- appscale/tools/local_state.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/appscale/tools/local_state.py b/appscale/tools/local_state.py index 0831f5ef..d1b9171e 100644 --- a/appscale/tools/local_state.py +++ b/appscale/tools/local_state.py @@ -31,7 +31,7 @@ # The version of the AppScale Tools we're running on. -APPSCALE_VERSION = "3.6.0" +APPSCALE_VERSION = "3.6.1" class LocalState(object): diff --git a/setup.py b/setup.py index 1a4a26f6..430952f3 100644 --- a/setup.py +++ b/setup.py @@ -33,7 +33,7 @@ setup( name='appscale-tools', - version='3.6.0', + version='3.6.1', description='A set of command-line tools for interacting with AppScale', long_description=long_description, author='AppScale Systems, Inc.',