cloud-init-dev team mailing list archive

[Arnd <arnd@xxxxxxxxxx>]

Arnd has proposed merging ~arnd-arndnet/cloud-init:document_gce_datasource into cloud-init:master.

Commit message:
doc: document GCE datasource.

Add some minimal documentation for GCE datasource.

Requested reviews:
  Server Team CI bot (server-team-bot): continuous-integration
  cloud-init commiters (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~arnd-arndnet/cloud-init/+git/cloud-init/+merge/331356

Add some minimal documentation for GCE datasource.
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~arnd-arndnet/cloud-init:document_gce_datasource into cloud-init:master.

diff --git a/doc/rtd/topics/datasources/gce.rst b/doc/rtd/topics/datasources/gce.rst
index 8406695..bcef610 100644
--- a/doc/rtd/topics/datasources/gce.rst
+++ b/doc/rtd/topics/datasources/gce.rst
@@ -5,8 +5,16 @@ Google Compute Engine
 
 The GCE datasource gets its data from the internal compute metadata server.
 Metadata can be queried at the URL
+<<<<<<< doc/rtd/topics/datasources/gce.rst
 '``http://metadata.google.internal/computeMetadata/v1/``'
 from within an instance.  For more information see the `GCE metadata docs`_.
+=======
+``http://metadata.google.internal/computeMetadata/v1/``
+from within an instance.
+
+(for reference see
+https://cloud.google.com/compute/docs/storing-retrieving-metadata#querying)
+>>>>>>> doc/rtd/topics/datasources/gce.rst
 
 Currently the default project and instance level metadatakeys keys
 ``project/attributes/sshKeys`` and ``instance/attributes/ssh-keys`` are merged
@@ -15,6 +23,9 @@ to provide ``public-keys``.
 ``user-data`` and ``user-data-encoding`` can be provided to cloud-init by
 setting those custom metadata keys for an *instance*.
 
+<<<<<<< doc/rtd/topics/datasources/gce.rst
 .. _GCE metadata docs: https://cloud.google.com/compute/docs/storing-retrieving-metadata#querying
+=======
+>>>>>>> doc/rtd/topics/datasources/gce.rst
 
 .. vi: textwidth=78