From fb1e6bb4ebdda1e439a93bb83ce7e487188d038c Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 15 Feb 2024 16:10:32 +0100 Subject: [PATCH 1/6] Enable cloud-init without any aid from ds-identify --- source/adminguide/templates/_cloud_init.rst | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/source/adminguide/templates/_cloud_init.rst b/source/adminguide/templates/_cloud_init.rst index c6caa45bb7..bdabe70475 100644 --- a/source/adminguide/templates/_cloud_init.rst +++ b/source/adminguide/templates/_cloud_init.rst @@ -62,6 +62,11 @@ These features can be implemented in `“Linux Template creation process” <_cr datasource: CloudStack: {} None: {} + + .. note:: + There is a known issue that ds-identify is not able to detect if CloudStack DataSource is enabled and run, if the vm instance is running on VMware or XenServer/XCP-ng. To fix the problem, please run the following command to enable cloud-init without any aid from ds-identify. + + echo "policy: enabled" > /etc/cloud/ds-identify.cfg #. **Password management** From 5eaaff68d8d1325f8652346e5f57de6a7366e73e Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 15 Feb 2024 16:34:47 +0100 Subject: [PATCH 2/6] fix some links --- source/adminguide/templates/_create_linux.rst | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/adminguide/templates/_create_linux.rst b/source/adminguide/templates/_create_linux.rst index 727b944e94..2e37a791ff 100644 --- a/source/adminguide/templates/_create_linux.rst +++ b/source/adminguide/templates/_create_linux.rst @@ -35,14 +35,14 @@ An overview of the procedure is as follow: #. Create an Instance with this ISO. For more information, see `“Creating - VMs” `_. + VMs” `_. #. 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 `_ + * `Adding Password Management to Your 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 `_ * `Implementing a SSH-Key bash script `_ #. **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 `_. #. **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 `_. #. **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>`_. From 3ead375fc6da92058ba75efbb85060699136519d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 15 Feb 2024 16:40:32 +0100 Subject: [PATCH 3/6] Update userdata section --- source/adminguide/templates.rst | 2 +- source/adminguide/templates/_create_linux.rst | 4 ++-- source/adminguide/virtual_machines/user-data.rst | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/source/adminguide/templates.rst b/source/adminguide/templates.rst index 7429c6ed48..ece4cd6a4f 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/_create_linux.rst b/source/adminguide/templates/_create_linux.rst index 2e37a791ff..5cb39204d8 100644 --- a/source/adminguide/templates/_create_linux.rst +++ b/source/adminguide/templates/_create_linux.rst @@ -30,12 +30,12 @@ An overview of the procedure is as follow: #. Upload your Linux ISO. For more information, see `“Adding an - ISO” `_. + ISO” `_. #. Create an Instance with this ISO. For more information, see `“Creating - VMs” `_. + Instnaces” `_. #. Prepare the Linux Instance diff --git a/source/adminguide/virtual_machines/user-data.rst b/source/adminguide/virtual_machines/user-data.rst index 74a37a647a..1c715e1235 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 `_ + Custom user-data example ~~~~~~~~~~~~~~~~~~~~~~~~ From 1420dda1da9fd5d3c1c9f0e5788ef54bb941be6d Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Thu, 15 Feb 2024 16:53:48 +0100 Subject: [PATCH 4/6] fix some links --- source/adminguide/templates/_create_linux.rst | 2 +- source/adminguide/templates/_create_windows.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/adminguide/templates/_create_linux.rst b/source/adminguide/templates/_create_linux.rst index 5cb39204d8..895e2e0909 100644 --- a/source/adminguide/templates/_create_linux.rst +++ b/source/adminguide/templates/_create_linux.rst @@ -35,7 +35,7 @@ An overview of the procedure is as follow: #. Create an Instance with this ISO. For more information, see `“Creating - Instnaces” `_. + Instances” `_. #. Prepare the Linux Instance diff --git a/source/adminguide/templates/_create_windows.rst b/source/adminguide/templates/_create_windows.rst index 53adfe05b4..eeeb8768ac 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” `_. + instances” `_. #. Follow the steps in Sysprep for Windows Server 2008 R2 (below) or Sysprep for Windows Server 2003 R2, depending on your version of From 9c7b614d4f16699e03a86ba3115e7704964cbd9b Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Mon, 10 Jun 2024 08:53:35 +0200 Subject: [PATCH 5/6] Update 2024-06-10 --- source/adminguide/templates/_cloud_init.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/adminguide/templates/_cloud_init.rst b/source/adminguide/templates/_cloud_init.rst index bdabe70475..090984beb6 100644 --- a/source/adminguide/templates/_cloud_init.rst +++ b/source/adminguide/templates/_cloud_init.rst @@ -64,7 +64,7 @@ These features can be implemented in `“Linux Template creation process” <_cr None: {} .. note:: - There is a known issue that ds-identify is not able to detect if CloudStack DataSource is enabled and run, if the vm instance is running on VMware or XenServer/XCP-ng. To fix the problem, please run the following command to enable cloud-init without any aid from ds-identify. + 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. echo "policy: enabled" > /etc/cloud/ds-identify.cfg From 7a85eac85db1aa18e7f7d5b8b63fbfbd63241003 Mon Sep 17 00:00:00 2001 From: Wei Zhou Date: Tue, 11 Jun 2024 16:26:35 +0200 Subject: [PATCH 6/6] Update source/adminguide/templates/_cloud_init.rst Co-authored-by: Vishesh --- source/adminguide/templates/_cloud_init.rst | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/adminguide/templates/_cloud_init.rst b/source/adminguide/templates/_cloud_init.rst index 090984beb6..33e49683e7 100644 --- a/source/adminguide/templates/_cloud_init.rst +++ b/source/adminguide/templates/_cloud_init.rst @@ -66,7 +66,9 @@ These features can be implemented in `“Linux Template creation process” <_cr .. 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. - echo "policy: enabled" > /etc/cloud/ds-identify.cfg + .. code:: bash + + echo "policy: enabled" > /etc/cloud/ds-identify.cfg #. **Password management**