From 1b049e6e51a9ac1ca02bf33629ede5c47c5b1941 Mon Sep 17 00:00:00 2001 From: Tak Nishigori Date: Thu, 23 Apr 2020 03:38:15 +0900 Subject: YAML align indent sizes for docs readability (#323) This proposal has been aligned in a human readable. There are no changes to this except for spac The indentation size is not specifically defined in the YAML RFC $ make yaml has passed on my-machine I set the indentation size to the largest number of articles in the repository (dictionary: 2) (And also include nishigori as a CLA signer.) --- doc/rtd/topics/datasources/cloudstack.rst | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'doc/rtd/topics/datasources/cloudstack.rst') diff --git a/doc/rtd/topics/datasources/cloudstack.rst b/doc/rtd/topics/datasources/cloudstack.rst index da183226..592328ea 100644 --- a/doc/rtd/topics/datasources/cloudstack.rst +++ b/doc/rtd/topics/datasources/cloudstack.rst @@ -37,11 +37,11 @@ An example configuration with the default values is provided below: .. sourcecode:: yaml datasource: - CloudStack: - max_wait: 120 - timeout: 50 - datasource_list: - - CloudStack + CloudStack: + max_wait: 120 + timeout: 50 + datasource_list: + - CloudStack .. _Apache CloudStack: http://cloudstack.apache.org/ -- cgit v1.2.3 From e52ec4ebb8042e3be8c409252f6bbeb1fd767ee2 Mon Sep 17 00:00:00 2001 From: Gregor Riepl Date: Tue, 9 Jun 2020 17:18:29 +0200 Subject: Document CloudStack data-server well-known hostname (#399) * Document CloudStack data-server well-known hostname * Document fallback to default gateway * Add onitake to CLA signers list --- doc/rtd/topics/datasources/cloudstack.rst | 16 +++++++++++----- tools/.github-cla-signers | 1 + 2 files changed, 12 insertions(+), 5 deletions(-) (limited to 'doc/rtd/topics/datasources/cloudstack.rst') diff --git a/doc/rtd/topics/datasources/cloudstack.rst b/doc/rtd/topics/datasources/cloudstack.rst index 592328ea..a24de34f 100644 --- a/doc/rtd/topics/datasources/cloudstack.rst +++ b/doc/rtd/topics/datasources/cloudstack.rst @@ -9,14 +9,20 @@ dhcp lease information given to the instance. For more details on meta-data and user-data, refer the `CloudStack Administrator Guide`_. -URLs to access user-data and meta-data from the Virtual Machine. Here 10.1.1.1 -is the Virtual Router IP: +URLs to access user-data and meta-data from the Virtual Machine. +`data-server.` is a well-known hostname provided by the CloudStack virtual +router that points to the next UserData server (which is usually also +the virtual router). .. code:: bash - http://10.1.1.1/latest/user-data - http://10.1.1.1/latest/meta-data - http://10.1.1.1/latest/meta-data/{metadata type} + http://data-server./latest/user-data + http://data-server./latest/meta-data + http://data-server./latest/meta-data/{metadata type} + +If `data-server.` cannot be resolved, cloud-init will try to obtain the +virtual router's address from the system's DHCP leases. If that fails, +it will use the system's default gateway. Configuration ------------- diff --git a/tools/.github-cla-signers b/tools/.github-cla-signers index 01916b70..f98c7a45 100644 --- a/tools/.github-cla-signers +++ b/tools/.github-cla-signers @@ -4,6 +4,7 @@ dhensby lucasmoura matthewruffell nishigori +onitake smoser tomponline TheRealFalcon -- cgit v1.2.3