merge from trunk

5 files changed, 143 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index af53a735..4771dc89 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -27,7 +27,8 @@
  - skip config_modules that declare themselves only verified on a set of
    distros.  Add them to 'unverified_modules' list to run anyway.
  - Add CloudSigma datasource [Kiril Vladimiroff]
- - Add intiial support for Gentoo and Arch distributions [Nate House]
+ - Add initial support for Gentoo and Arch distributions [Nate House]
+ - Add GCE datasource [Vaidas Jablonskis]
 0.7.4:
  - fix issue mounting 'ephemeral0' if ephemeral0 was an alias for a
    partitioned block device with target filesystem on ephemeral0.1.
diff --git a/cloudinit/settings.py b/cloudinit/settings.py
index 7b0b18e7..0d8d8ec5 100644
--- a/cloudinit/settings.py
+++ b/cloudinit/settings.py
@@ -36,6 +36,7 @@ CFG_BUILTIN = {
         'AltCloud',
         'OVF',
         'MAAS',
+        'GCE',
         'Ec2',
         'CloudSigma',
         'CloudStack',
diff --git a/cloudinit/sources/DataSourceCloudSigma.py b/cloudinit/sources/DataSourceCloudSigma.py
index 78acd8a4..e734d7e5 100644
--- a/cloudinit/sources/DataSourceCloudSigma.py
+++ b/cloudinit/sources/DataSourceCloudSigma.py
@@ -45,18 +45,25 @@ class DataSourceCloudSigma(sources.DataSource):
         Metadata is the whole server context and /meta/cloud-config is used
         as userdata.
         """
+        dsmode = None
         try:
             server_context = self.cepko.all().result
             server_meta = server_context['meta']
-            self.userdata_raw = server_meta.get('cloudinit-user-data', "")
-            self.metadata = server_context
-            self.ssh_public_key = server_meta['ssh_public_key']
-
-            if server_meta.get('cloudinit-dsmode') in VALID_DSMODES:
-                self.dsmode = server_meta['cloudinit-dsmode']
         except:
             util.logexc(LOG, "Failed reading from the serial port")
             return False
+
+        dsmode = server_meta.get('cloudinit-dsmode', self.dsmode)
+        if dsmode not in VALID_DSMODES:
+            LOG.warn("Invalid dsmode %s, assuming default of 'net'", dsmode)
+            dsmode = 'net'
+        if dsmode == "disabled" or dsmode != self.dsmode:
+            return False
+
+        self.userdata_raw = server_meta.get('cloudinit-user-data', "")
+        self.metadata = server_context
+        self.ssh_public_key = server_meta['ssh_public_key']
+
         return True
 
     def get_hostname(self, fqdn=False, resolve_ip=False):
@@ -76,11 +83,17 @@ class DataSourceCloudSigma(sources.DataSource):
         return self.metadata['uuid']
 
 
+class DataSourceCloudSigmaNet(DataSourceCloudSigma):
+    def __init__(self, sys_cfg, distro, paths):
+        DataSourceCloudSigma.__init__(self, sys_cfg, distro, paths)
+        self.dsmode = 'net'
+
+
 # Used to match classes to dependencies. Since this datasource uses the serial
 # port network is not really required, so it's okay to load without it, too.
 datasources = [
     (DataSourceCloudSigma, (sources.DEP_FILESYSTEM)),
-    (DataSourceCloudSigma, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
+    (DataSourceCloudSigmaNet, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
 ]
 
 
diff --git a/cloudinit/sources/DataSourceGCE.py b/cloudinit/sources/DataSourceGCE.py
new file mode 100644
index 00000000..95a410ba
--- /dev/null
+++ b/cloudinit/sources/DataSourceGCE.py
@@ -0,0 +1,117 @@
+# vi: ts=4 expandtab
+#
+#    Author: Vaidas Jablonskis <jablonskis@gmail.com>
+#
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License version 3, as
+#    published by the Free Software Foundation.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+#
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+
+from cloudinit import log as logging
+from cloudinit import util
+from cloudinit import sources
+from cloudinit import url_helper
+
+LOG = logging.getLogger(__name__)
+
+BUILTIN_DS_CONFIG = {
+    'metadata_url': 'http://metadata.google.internal./computeMetadata/v1/'
+}
+REQUIRED_FIELDS = ('instance-id', 'availability-zone', 'local-hostname')
+
+
+class DataSourceGCE(sources.DataSource):
+    def __init__(self, sys_cfg, distro, paths):
+        sources.DataSource.__init__(self, sys_cfg, distro, paths)
+        self.metadata = {}
+        self.ds_cfg = util.mergemanydict([
+            util.get_cfg_by_path(sys_cfg, ["datasource", "GCE"], {}),
+            BUILTIN_DS_CONFIG])
+        self.metadata_address = self.ds_cfg['metadata_url']
+
+    # GCE takes sshKeys attribute in the format of '<user>:<public_key>'
+    # so we have to trim each key to remove the username part
+    def _trim_key(self, public_key):
+        try:
+            index = public_key.index(':')
+            if index > 0:
+                return public_key[(index + 1):]
+        except:
+            return public_key
+
+    def get_data(self):
+        # GCE metadata server requires a custom header since v1
+        headers = {'X-Google-Metadata-Request': True}
+
+        url_map = {
+            'instance-id': self.metadata_address + 'instance/id',
+            'availability-zone': self.metadata_address + 'instance/zone',
+            'public-keys': self.metadata_address + 'project/attributes/sshKeys',
+            '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 not util.is_resolvable(self.metadata_address):
+            LOG.debug("%s is not resolvable", self.metadata_address)
+            return False
+
+        for mkey in url_map.iterkeys():
+            try:
+                resp = url_helper.readurl(url=url_map[mkey], headers=headers,
+                                          retries=0)
+            except IOError:
+                return False
+            if resp.ok():
+                if mkey == 'public-keys':
+                    pub_keys = [self._trim_key(k) for k in resp.contents.splitlines()]
+                    self.metadata[mkey] = pub_keys
+                else:
+                    self.metadata[mkey] = resp.contents
+            else:
+                if mkey in REQUIRED_FIELDS:
+                    LOG.warn("required metadata '%s' not found in metadata",
+                        url_map[mkey])
+                    return False
+                        
+                self.metadata[mkey] = None
+                return False
+
+        self.user_data_raw = self.metadata['user-data']
+        return True
+
+    @property
+    def launch_index(self):
+        # GCE does not provide lauch_index property
+        return None
+
+    def get_instance_id(self):
+        return self.metadata['instance-id']
+
+    def get_public_ssh_keys(self):
+        return self.metadata['public-keys']
+
+    def get_hostname(self, fqdn=False):
+        return self.metadata['local-hostname']
+
+    @property
+    def availability_zone(self):
+        return self.metadata['instance-zone']
+
+# Used to match classes to dependencies
+datasources = [
+    (DataSourceGCE, (sources.DEP_FILESYSTEM, sources.DEP_NETWORK)),
+]
+
+
+# Return a list of data sources that match this set of dependencies
+def get_datasource_list(depends):
+    return sources.list_from_depends(depends, datasources)
diff --git a/doc/sources/cloudsigma/README.rst b/doc/sources/cloudsigma/README.rst
index 8cb2b0fe..1d9160a2 100644
--- a/doc/sources/cloudsigma/README.rst
+++ b/doc/sources/cloudsigma/README.rst
@@ -23,9 +23,9 @@ You can provide user-data to the VM using the dedicated `meta field`_ in the `se
 header could be omitted. However since this is a raw-text field you could provide any of the valid
 `config formats`_.
 
-If your user-data needs an internet connection you have to create a `meta field`_ in the `server context`_
-``cloudinit-dsmode`` and set "net" as value. If this field does not exist the default value is "local".
-
+If your user-data does not need an internet connection you can create a
+`meta field`_ in the `server context`_ ``cloudinit-dsmode`` and set "local" as value.
+If this field does not exist the default value is "net".
 
 
 .. _CloudSigma: http://cloudsigma.com/