x/cloud-init
Code Issues Proposed changes

add 'user-data' support.

Browse Source 
This just adds user-data in 'instance/attributes/user-data'.
Also turns retries to 0 on all other things.
This commit is contained in:
Scott Moser 2014-02-13 10:58:08 -05:00
parent 97da04d01c
commit 60c7a6a84e
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
cloudinit/sources/DataSourceGCE.py
View File

@ -25,6 +25,7 @@ LOG = logging.getLogger(__name__)
BUILTIN_DS_CONFIG = { BUILTIN_DS_CONFIG = {
'metadata_url': 'http://metadata.google.internal./computeMetadata/v1/' 'metadata_url': 'http://metadata.google.internal./computeMetadata/v1/'
} }
REQUIRED_FIELDS = ('instance-id', 'availability-zone', 'local-hostname')
class DataSourceGCE(sources.DataSource): class DataSourceGCE(sources.DataSource):
@ -55,6 +56,7 @@ class DataSourceGCE(sources.DataSource):
'availability-zone': self.metadata_address + 'instance/zone', 'availability-zone': self.metadata_address + 'instance/zone',
'public-keys': self.metadata_address + 'project/attributes/sshKeys', 'public-keys': self.metadata_address + 'project/attributes/sshKeys',
'local-hostname': self.metadata_address + 'instance/hostname', 'local-hostname': self.metadata_address + 'instance/hostname',
'user-data': self.metadata_address + 'instance/attributes/user-data',
} }
# if we cannot resolve the metadata server, then no point in trying # if we cannot resolve the metadata server, then no point in trying
@ -64,7 +66,8 @@ class DataSourceGCE(sources.DataSource):
for mkey in url_map.iterkeys(): for mkey in url_map.iterkeys():
try: try:
resp = url_helper.readurl(url=url_map[mkey], headers=headers) resp = url_helper.readurl(url=url_map[mkey], headers=headers,
retries=0)
except IOError: except IOError:
return False return False
if resp.ok(): if resp.ok():
@ -74,8 +77,15 @@ class DataSourceGCE(sources.DataSource):
else: else:
self.metadata[mkey] = resp.contents self.metadata[mkey] = resp.contents
else: else:
if mkey in REQUIRED_FIELDS:
LOG.warn("required metadata '%s' not found in metadata",
url_map[mkey])
return False
self.metadata[mkey] = None self.metadata[mkey] = None
return False return False
self.user_data_raw = self.metadata['user-data']
return True return True
@property @property
@ -92,9 +102,6 @@ class DataSourceGCE(sources.DataSource):
def get_hostname(self, fqdn=False): def get_hostname(self, fqdn=False):
return self.metadata['local-hostname'] return self.metadata['local-hostname']
def get_userdata_raw(self):
return None
@property @property
def availability_zone(self): def availability_zone(self):
return self.metadata['instance-zone'] return self.metadata['instance-zone']