Merge branch '4.20'

Author: sureshanaparti

source/_static/images/deployvm_userdata.png

@@ -46,28 +46,27 @@ Authentication.
 User Data and Meta Data
 ~~~~~~~~~~~~~~~~~~~~~~~
 
-The user-data service on a Shared or Isolated Network can be provided through the
+The User Data service on a Shared or Isolated Network can be provided through the
 Virtual Router or through an attached iso called the Config drive.
 
 User Data and Meta Data Via Virtual Router
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 
-CloudStack provides API access to attach up to 32KB of user data to a
+CloudStack provides API access to attach up to 32KB of User Data to a
 deployed Instance. Deployed Instances also have access to metadata via the
 virtual router.
 
-User data can be accessed once the IP address of the virtual router is
+User Data can be accessed once the IP address of the virtual router is
 known. Once the IP address is known, use the following steps to access
-the user data:
+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
@@ -98,15 +97,15 @@ User Data and Meta Data via Config Drive
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 Config drive is an ISO file that is mounted as a cd-rom on a user Instance and
-contains related userdata, metadata (incl. ssh-keys) and
+contains related User Data, metadata (incl. ssh-keys) and
 password files.
 
 Enable config drive
 ~~~~~~~~~~~~~~~~~~~
 To use the config drive the Network offering must have the “ConfigDrive”
-provider selected for the userdata service.
+provider selected for the User Data service.
 
-If the networkoffering uses ConfigDrive for userdata and the Template is
+If the networkoffering uses ConfigDrive for User Data and the Template is
 password enabled, the password string for the Instance is placed in the
 vm_password.txt file and it is included in the ISO.
 
@@ -117,13 +116,13 @@ user Instance, such that any other ISO image (e.g. boot image or vmware tools)
 is mounted on 1st cd/dvd drive. This means existing functionality of
 supporting 1 cd rom drive is still available.
 
-At password reset or update of user data, the Config Drive ISO
+At password reset or update of User Data, the Config Drive ISO
 will be rebuilt. The existing ISO is mounted on a temporary directory,
-password, userdata or ssh-keys are updated and a new ISO is built from the
+password, User Data or ssh-keys are updated and a new ISO is built from the
 updated directory structure.
 
 In case of a password reset, the new password will be picked-up at Instance start.
-To access the updated userdata, the user needs to remount the config drive ISO.
+To access the updated User Data, the user needs to remount the config drive ISO.
 
 When an Instance is stopped, the ConfigDrive network element will trigger the
 Secondary Storage VM to remove the ISO from the secondary storage.

source/_static/images/deployvm_userdata_with_variables.png

@@ -170,10 +170,10 @@ Specify the following:
    For more information, see `“Affinity Groups”
    <virtual_machines.html#affinity-groups>`_.
 
--  Userdata: The userdata of the Instances.
+-  User Data: The User Data of the Instances.
 
-   For more information, see `“User-Data and Meta-Data”
-   <virtual_machines.html#user-data-and-meta-data>`_.
+   For more information, see `“User Data and Metadata”
+   <virtual_machines.html#user-data-and-metadata>`_.
 
 
 AutoScale Policies
@@ -287,7 +287,7 @@ then click Edit AutoScale Instance Profile button.
 
 |autoscale-vmgroup-profile-update.png|
 
-You are able to reset userdata of the Instance, by clicking Reset Userdata on AutoScale Instance Group button.
+You are able to reset User Data of the Instance, by clicking Reset User Data on AutoScale Instance Group button.
 
 |autoscale-vmgroup-profile-reset-userdata.png|
 
@@ -399,5 +399,5 @@ a service assigned to a rule inside the context of AutoScale.
 .. |autoscale-vmgroup-profile-update.png| image:: /_static/images/autoscale-vmgroup-profile-update.png
    :alt: Update AutoScale Instance Profile.
 .. |autoscale-vmgroup-profile-reset-userdata.png| image:: /_static/images/autoscale-vmgroup-profile-reset-userdata.png
-   :alt: Reset Userdata in AutoScale Instance Profile.
+   :alt: Reset User Data in AutoScale Instance Profile.
 

source/_static/images/register_userdata.png

@@ -106,7 +106,7 @@ IP addresses.
 
 -  CloudStack does not assign IP addresses to instances.
 
--  Userdata and metadata can be passed to the instance using a config drive
+-  User Data and metadata can be passed to the instance using a config drive
    (which must be enabled in the network service offering)
 
 Example GUI dialog box (for a regular user account) is shown below:
@@ -367,8 +367,8 @@ To create a network offering:
                           been configured in the cloud.
       VPN                 For more information, see `“Remote Access                                    Supported     Not Supported
                           VPN” <networking_and_traffic.html#remote-access-vpn>`_.
-      User Data           For more information, see `“User Data and Meta                               Not Supported Supported
-                          Data” <api.html#user-data-and-meta-data>`_.
+      User Data           For more information, see `“User Data and Metadata                           Not Supported Supported
+                          ” <api.html#user-data-and-metadata>`_.
       Network ACL         For more information, see `“Configuring Network Access Control List          Supported     Not Supported
                           ” <networking_and_traffic.html#configuring-network-access-control-list>`_.
       Security Groups     For more information, see `“Adding a Security                                Not Supported Supported

source/_static/images/register_userdata_with_variables.png

@@ -40,8 +40,8 @@ About Network Mode
 Network mode indicates the mode with which the isolated network or VPC will operate.
 There are two valid options
 
-- NATTED. This is the default network mode of isolated networks. The VR of isolated networks and VPCs provides Source NAT services, as well as Static NAT, Load Balancer, Port Forwarding, Vpn if the network offering supports.
-- ROUTED. For isolated networks in ROUTED mode, the VR no longer supports Source NAT, Static NAT, Load Balancer, Port Forwarding and Vpn. The supported services are Dns, Dhcp, Userdata, Firewall (for isolated networks) and Network ACL (for vpc and vpc networks).
+- NATTED. This is the default network mode of isolated networks. The VR of isolated networks and VPCs provides Source NAT services, as well as Static NAT, Load Balancer, Port Forwarding, VPN if the network offering supports.
+- ROUTED. For isolated networks in ROUTED mode, the VR no longer supports Source NAT, Static NAT, Load Balancer, Port Forwarding and VPN. The supported services are DNS, DHCP, User data, Firewall (for isolated networks) and Network ACL (for VPC and VPC networks).
 
 
 About Routing mode

source/_static/images/userdata_template_link.png

@@ -133,7 +133,7 @@ To enable VPN for a VPC:
 
    -  Site-to-Site VPNs
 
-   -  Network ACL Lists
+   -  Network ACLs
 
 #. In the Router node, select Public IP Addresses.