summaryrefslogtreecommitdiff
path: root/packages
diff options
context:
space:
mode:
authorRick Wright <rickw@google.com>2019-04-30 12:45:51 -0700
committerRick Wright <rickw@google.com>2019-04-30 12:45:51 -0700
commit65bd5e416c3a52c14ecf13196528cc42eace852d (patch)
tree0df505f615303b16673ad1626b76c695c8a82bca /packages
parent0666936cd30834410739b6c82691a0addb5bff01 (diff)
downloadgoogle-compute-image-packages-65bd5e416c3a52c14ecf13196528cc42eace852d.tar.gz
Constant name change and indentation fixes.
Diffstat (limited to 'packages')
-rwxr-xr-xpackages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py14
1 files changed, 7 insertions, 7 deletions
diff --git a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
index 8e55a43..3db7b77 100755
--- a/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
+++ b/packages/python-google-compute-engine/google_compute_engine/instance_setup/instance_setup.py
@@ -34,13 +34,13 @@ from google_compute_engine.instance_setup import instance_config
class PutRequest(urlrequest.Request):
- def get_method(self):
- return 'PUT'
+ def get_method(self):
+ return 'PUT'
GUEST_ATTRIBUTES_URL = ('http://metadata.google.internal/computeMetadata/v1beta1/'
'instance/guest-attributes')
-GA_NAMESPACE = 'hostkeys'
+HOSTKEY_NAMESPACE = 'hostkeys'
class InstanceSetup(object):
@@ -156,18 +156,18 @@ class InstanceSetup(object):
file_utils.SetPermissions(key_dest, mode=0o600)
file_utils.SetPermissions('%s.pub' % key_dest, mode=0o644)
with open('%s.pub' % key_dest, 'r') as pk:
- key_data = pk.read()
+ key_data = pk.read()
key_values = key_data.split()
if len(key_values) < 2:
- return
+ return
else:
- return key_values[0], key_values[1]
+ return key_values[0], key_values[1]
def _WriteHostKeyToGuestAttributes(self, key_type, key_value):
"""Write a host key to guest attributes, ignoring errors."""
headers = {'Metadata-Flavor': 'Google'}
- url = '%s/%s/%s' % (GUEST_ATTRIBUTES_URL, GA_NAMESPACE, key_type)
+ url = '%s/%s/%s' % (GUEST_ATTRIBUTES_URL, HOSTKEY_NAMESPACE, key_type)
req = PutRequest(url, key_value, headers)
try:
response = urlrequest.urlopen(req)