This is an automated email from the ASF dual-hosted git repository.
weizhou pushed a commit to branch 4.19
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git
The following commit(s) were added to refs/heads/4.19 by this push:
new 831ee0a Enable cloud-init without any aid from ds-identify (#383)
831ee0a is described below
commit 831ee0abb0ab30edb6c937a7ace2e85e16a0a829
Author: Wei Zhou <[email protected]>
AuthorDate: Tue Jun 11 17:08:02 2024 +0200
Enable cloud-init without any aid from ds-identify (#383)
* Enable cloud-init without any aid from ds-identify
* fix some links
* Update userdata section
* fix some links
* Update 2024-06-10
* Update source/adminguide/templates/_cloud_init.rst
Co-authored-by: Vishesh <[email protected]>
---------
Co-authored-by: Vishesh <[email protected]>
---
source/adminguide/templates.rst | 2 +-
source/adminguide/templates/_cloud_init.rst | 7 +++++++
source/adminguide/templates/_create_linux.rst | 18 +++++++++---------
source/adminguide/templates/_create_windows.rst | 2 +-
source/adminguide/virtual_machines/user-data.rst | 2 ++
5 files changed, 20 insertions(+), 11 deletions(-)
diff --git a/source/adminguide/templates.rst b/source/adminguide/templates.rst
index 7429c6e..ece4cd6 100644
--- a/source/adminguide/templates.rst
+++ b/source/adminguide/templates.rst
@@ -444,7 +444,7 @@ hypervisor-specific.
Adding an ISO
----------------
+-------------
To make additional operating system or other software available for use
with Guest Instances, you can add an ISO. The ISO is typically thought of as
diff --git a/source/adminguide/templates/_cloud_init.rst
b/source/adminguide/templates/_cloud_init.rst
index c6caa45..33e4968 100644
--- a/source/adminguide/templates/_cloud_init.rst
+++ b/source/adminguide/templates/_cloud_init.rst
@@ -62,6 +62,13 @@ These features can be implemented in `“Linux Template
creation process” <_cr
datasource:
CloudStack: {}
None: {}
+
+ .. note::
+ For the vm instances running on VMware or XenServer/XCP-ng hypervisors,
if there are multiple cloud-init data sources, it is a known issue that
ds-identify is not able to detect if "CloudStack" DataSource is enabled. To fix
the problem, please run the following command to enable cloud-init without any
aid from ds-identify.
+
+ .. code:: bash
+
+ echo "policy: enabled" > /etc/cloud/ds-identify.cfg
#. **Password management**
diff --git a/source/adminguide/templates/_create_linux.rst
b/source/adminguide/templates/_create_linux.rst
index 727b944..895e2e0 100644
--- a/source/adminguide/templates/_create_linux.rst
+++ b/source/adminguide/templates/_create_linux.rst
@@ -30,19 +30,19 @@ An overview of the procedure is as follow:
#. Upload your Linux ISO.
For more information, see `“Adding an
- ISO” <virtual_machines.html#adding-an-iso>`_.
+ ISO” <templates.html#adding-an-iso>`_.
#. Create an Instance with this ISO.
For more information, see `“Creating
- VMs” <virtual_machines.html#creating-vms>`_.
+ Instances” <virtual_machines.html#creating-instances>`_.
#. Prepare the Linux Instance
#. Create a Template from the Instance.
For more information, see `“Creating a Template from an Existing
- Instance” <#creating-a-template-from-an-existing-virtual-machine>`_.
+ Instance” <#creating-a-template-from-an-existing-instance>`_.
System preparation for Linux
@@ -114,25 +114,25 @@ templating of Centos and Ubuntu.
User password management and reset cappabilities in GUI are available with:
- * `Cloud-init integration <_cloud_init.html#linux-with-cloud-init>`_
- * `Adding Password Management to Your Templates
<_password.html#adding-password-management-to-templates>`_ /Legacy for non
systemd systems only/
+ * `Cloud-init integration
<templates/_cloud_init.html#linux-with-cloud-init>`_
+ * `Adding Password Management to Your Templates
<templates.html#adding-password-management-to-templates>`_ /Legacy for non
systemd systems only/
#. **SSH keys management**
Cloudstack can create key pair and push certificates to Instances. This
feature is available with:
- * `Cloud-init integration <_cloud_init.html#linux-with-cloud-init>`_
+ * `Cloud-init integration
<templates/_cloud_init.html#linux-with-cloud-init>`_
* `Implementing a SSH-Key bash script
<http://docs.cloudstack.apache.org/en/latest/adminguide/virtual_machines.html#creating-an-instance-template-that-supports-ssh-keys>`_
#. **Partition management**
Volumes can autorextend after reboot when partition is extended in the GUI.
- This feature is possible with `Cloud-init integration
<_cloud_init.html#linux-with-cloud-init>`_.
+ This feature is possible with `Cloud-init integration
<templates/_cloud_init.html#linux-with-cloud-init>`_.
#. **User-data**
Cloudstack can push user-data during Instance creation.
- This feature is possible with `Cloud-init integration
<_cloud_init.html#linux-with-cloud-init>`_.
+ This feature is possible with `Cloud-init integration
<templates/_cloud_init.html#linux-with-cloud-init>`_.
#. **Template cleanup**
@@ -214,4 +214,4 @@ templating of Centos and Ubuntu.
You are now ready to create the Final Template, for more information see
`“Creating a Template from an Existing Virtual
- Machine” <#creating-a-template-from-an-existing-virtual-machine>`_.
+ Machine” <#creating-a-template-from-an-existing-instance>`_.
diff --git a/source/adminguide/templates/_create_windows.rst
b/source/adminguide/templates/_create_windows.rst
index 53adfe0..eeeb876 100644
--- a/source/adminguide/templates/_create_windows.rst
+++ b/source/adminguide/templates/_create_windows.rst
@@ -38,7 +38,7 @@ An overview of the procedure is as follows:
#. Create an instance with this ISO.
For more information, see `“Creating
- instances” <virtual_machines.html#creating-vms>`_.
+ instances” <virtual_machines.html#creating-instances>`_.
#. Follow the steps in Sysprep for Windows Server 2008 R2 (below) or
Sysprep for Windows Server 2003 R2, depending on your version of
diff --git a/source/adminguide/virtual_machines/user-data.rst
b/source/adminguide/virtual_machines/user-data.rst
index 74a37a6..1c715e1 100644
--- a/source/adminguide/virtual_machines/user-data.rst
+++ b/source/adminguide/virtual_machines/user-data.rst
@@ -217,6 +217,8 @@ Instance deployment automatically
(:ref:`adding-password-management-to-templates
datasource_list: [ CloudStack, None ]
+For more information, see `Cloud-init integration
<templates/_cloud_init.html#linux-with-cloud-init>`_
+
Custom user-data example
~~~~~~~~~~~~~~~~~~~~~~~~
