You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by su...@apache.org on 2025/08/28 10:06:49 UTC

(cloudstack-documentation) 01/01: Merge branch '4.20'

This is an automated email from the ASF dual-hosted git repository.

sureshanaparti pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack-documentation.git

commit 19bc138e2905e079e534eb046029074abeb25a0e
Merge: 52b5d545 393997a7
Author: Suresh Kumar Anaparti <su...@shapeblue.com>
AuthorDate: Thu Aug 28 15:36:28 2025 +0530

    Merge branch '4.20'

 source/_static/images/deployvm_userdata.png        | Bin 28071 -> 88487 bytes
 .../images/deployvm_userdata_with_variables.png    | Bin 32033 -> 102521 bytes
 source/_static/images/register_userdata.png        | Bin 31148 -> 124595 bytes
 .../images/register_userdata_with_variables.png    | Bin 33407 -> 103043 bytes
 source/_static/images/userdata_template_link.png   | Bin 64782 -> 231420 bytes
 source/adminguide/api.rst                          |  23 ++--
 .../adminguide/autoscale_with_virtual_router.rst   |  10 +-
 source/adminguide/networking.rst                   |   6 +-
 .../networking/dynamic_static_routing.rst          |   4 +-
 source/adminguide/networking/remote_access_vpn.rst |   2 +-
 source/adminguide/networking/site_to_site_vpn.rst  |   6 +-
 .../networking/virtual_private_cloud_config.rst    |  64 +++++------
 source/adminguide/reliability.rst                  |   2 +-
 source/adminguide/systemvm.rst                     |   2 +-
 source/adminguide/templates.rst                    |   6 +-
 source/adminguide/templates/_cloud_init.rst        |   6 +-
 source/adminguide/templates/_create_linux.rst      |   4 +-
 source/adminguide/virtual_machines/user-data.rst   | 123 +++++++++++----------
 source/conceptsandterminology/network_setup.rst    |   2 +-
 source/plugins/ipv6.rst                            |   6 +-
 source/plugins/nsx-plugin.rst                      |   2 +-
 source/releasenotes/compat.rst                     |  23 ++--
 source/upgrading/index.rst                         |   1 +
 source/upgrading/upgrade/upgrade_java_17_notes.rst |  43 +++++++
 source/upgrading/upgrade/upgrade_notes.rst         |   9 ++
 25 files changed, 199 insertions(+), 145 deletions(-)

diff --cc source/adminguide/api.rst
index 26690e96,2ea4c64a..d0a269b3
--- a/source/adminguide/api.rst
+++ b/source/adminguide/api.rst
@@@ -64,10 -64,8 +64,9 @@@ the User Data
  #. Run the following command to find the virtual router.
  
     .. code:: bash
 +
        # cat /var/lib/dhclient/dhclient-eth0.leases | grep dhcp-server-identifier | tail -1
- 
- #. Access user data by running the following command using the result of
+ #. Access User Data by running the following command using the result of
     the above command
  
     .. code:: bash
diff --cc source/adminguide/networking/virtual_private_cloud_config.rst
index 6b33883a,9edcc5c5..bf3ec5b3
--- a/source/adminguide/networking/virtual_private_cloud_config.rst
+++ b/source/adminguide/networking/virtual_private_cloud_config.rst
@@@ -347,18 -347,18 +347,18 @@@ destination" and / or "allow all ingres
  Afterwards traffic can be white- or blacklisted.
  
  .. note::
 -- ACL Rules in Cloudstack are stateful
 -- Source / Destination CIDRs are always external Networks
 -- ACL rules can also been seen on the virtual router of the VPC. Ingress
 -  rules are listed in the table iptables table "filter" while egress rules
 -  are placed in the "mangle" table
 -- ACL rules for ingress and egress are not correlating. For example a
 -  egress "deny all" won't affect traffic in response to an allowed ingress
 -  connection
 +    - ACL Rules in Cloudstack are stateful
 +    - Source / Destination CIDRs are always external Networks
 +    - ACL rules can also been seen on the virtual router of the VPC. Ingress
 +      rules are listed in the table iptables table "filter" while egress rules
 +      are placed in the "mangle" table
 +    - ACL rules for ingress and egress are not correlating. For example a
 +      egress "deny all" won't affect traffic in response to an allowed ingress
 +      connection
    
  
- Creating ACL Lists
- ^^^^^^^^^^^^^^^^^^
+ Creating ACLs
+ ^^^^^^^^^^^^^
  
  #. Log in to the CloudStack UI as an administrator or end User.
  
diff --cc source/adminguide/virtual_machines/user-data.rst
index 9a0fc271,7dcd2e76..bce96b82
--- a/source/adminguide/virtual_machines/user-data.rst
+++ b/source/adminguide/virtual_machines/user-data.rst
@@@ -12,17 -12,16 +12,18 @@@
     KIND, either express or implied.  See the License for the
     specific language governing permissions and limitations
     under the License.
- User-Data and Meta-Data
- =======================
  
- Users can register userdata in CloudStack and refer the registered userdata while
- deploying or editing or reset userdata on an instance. The userdata content can also be
- directly provided while deploying the instance. Userdata content length can be up to 32kb.
+ 
+ User Data and Metadata
+ ----------------------
+ 
+ Users can register User Data in CloudStack and refer the registered User Data while
+ deploying or editing or reset User Data on an instance. The User Data content can also be
+ directly provided while deploying the instance. User Data content length can be up to 32kb.
  
 +Register Userdata
- -----------------
 +
- To register a new userdata:
+ To register a new User Data:
  
  #. Log in to the CloudStack UI.
  
@@@ -46,12 -45,12 +47,12 @@@
  .. image:: /_static/images/register_userdata.png
     :width: 400px
     :align: center
-    :alt: Register userdata dialog box
 -   :alt: Regiser User Data dialog box
++   :alt: Register User Data dialog box
  
- If userdata content has variables declared in it, user can register the Userdata
- with userdata parameters.
+ If User Data content has variables declared in it, user can register the User Data
+ with User Data parameters.
  
- For example, if userdata content is like below having a custom variable "variable1"
+ For example, if User Data content is like below having a custom variable "variable1"
  
     .. code:: bash