Replace Userdata with User data

Author: abh1sar

source/adminguide/api.rst

@@ -94,15 +94,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.
 
@@ -115,11 +115,11 @@ supporting 1 cd rom drive is still available.
 
 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/adminguide/autoscale_with_virtual_router.rst

@@ -170,7 +170,7 @@ 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>`_.
@@ -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/adminguide/networking.rst

@@ -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:

source/adminguide/networking/dynamic_static_routing.rst

@@ -41,7 +41,7 @@ Network mode indicates the mode with which the isolated network or VPC will oper
 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).
+- 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/adminguide/systemvm.rst

@@ -829,7 +829,7 @@ it is upgraded:
 
 -  SecurityGroup
 
--  UserData
+-  User Data
 
 -  DHCP
 

source/adminguide/templates.rst

@@ -271,11 +271,11 @@ To upload a Template:
    -  **Tag**: The tag for the template. This tag can be used with host tags to
       allow deployment of Instances on specific hosts.
 
-   -  **Userdata**: The registered Userdata are listed. Select the
+   -  **User data**: The registered User data are listed. Select the
       desired one.
 
-   -  **Userdata link policy**: Select the userdata override policy as required. 
-      For more information on userdata and override link policy, please check `Userdata section <virtual_machines.html#user-data-and-meta-data>`_.
+   -  **User data link policy**: Select the user data override policy as required.
+      For more information on user data and override link policy, please check `User data section <virtual_machines.html#user-data-and-meta-data>`_.
 
 
    -  **Hypervisor**: The supported hypervisors are listed. Select the

source/adminguide/virtual_machines/user-data.rst

@@ -17,40 +17,40 @@
 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.
+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.
 
-To register a new userdata:
+To register a new user data:
 
 #. Log in to the CloudStack UI.
 
-#. In the left navigation bar, click Compute and then User Data.
+#. In the left navigation bar, click Compute and then User Data Library.
 
-#. Click Register a userdata.
+#. Click Register user data.
 
 #. In the dialog, make the following choices:
 
-   -  **Name**: Any desired name for the userdata.
+   -  **Name**: Any desired name for the user data.
 
-   -  **Userdata**: Plain userdata content. CloudStack UI does base64 encoding.
+   -  **User data**: Plain user data content. CloudStack UI does base64 encoding.
 
-   -  **Userdata parameters**: Comma separated list of variables which (if any) declared
-      in userdata content.
+   -  **User data parameters**: Comma separated list of variables which (if any) declared
+      in user data content.
 
-   -  **Domain**: An optional domain for the userdata.
+   -  **Domain**: An optional domain for the user data.
 
-   -  **Account**: An optional account for the userdata.
+   -  **Account**: An optional account for the user data.
 
 .. image:: /_static/images/register_userdata.png
    :width: 400px
    :align: center
-   :alt: Regiser userdata dialog box
+   :alt: Regiser 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
 
@@ -60,84 +60,84 @@ For example, if userdata content is like below having a custom variable "variabl
          - echo 'TestVariable {{ ds.meta_data.variable1 }}' >> /tmp/variable
          - echo 'Hostname {{ ds.meta_data.public_hostname }}' > /tmp/hostname
 
-Userdata has to be registered with userdata parameter "variable1" like below
+User data has to be registered with user data parameter "variable1" like below
 
 .. image:: /_static/images/register_userdata_with_variables.png
    :width: 400px
    :align: center
-   :alt: Regiser userdata with variables dialog box
+   :alt: Regiser user data with variables dialog box
 
-If the variables in userdata content are of a predefined metadata like "public_hostname"
-or "instance_id", then userdata parameters should not declare these variables. That is
+If the variables in user data content are of a predefined metadata like "public_hostname"
+or "instance_id", then user data parameters should not declare these variables. That is
 the reason in the above example "public_hostname" is not declared.
 
 There are three CloudStack APIs that can be used to provide user-data to instance:
 deployVirtualMachine, updateVirtualMachine and resetUserDataForVirtualMachine.
 These APIs accepts parameters ``userdataid`` and ``userdatadetails``.
 userdatadetails is to specify the custom values for the variables which are declared
-in userdata in a key value parameter map details.
+in user data in a key value parameter map details.
 
 .. image:: /_static/images/deployvm_userdata.png
    :width: 400px
    :align: center
-   :alt: Provide userdata id or userdata text dialog box
+   :alt: Provide user data id or user data text dialog box
 
-If the userdata contains variables that are declared during registration then those values
+If the user data contains variables that are declared during registration then those values
 has to be specified like below,
 
 .. image:: /_static/images/deployvm_userdata_with_variables.png
    :width: 400px
    :align: center
-   :alt: Provide userdata id or userdata with variables text dialog box
+   :alt: Provide userdata id or user data with variables text dialog box
 
 These details will be saved as meta-data file(s) in both config drive and virtual router,
 which in turn support jinja based instance meta-data feature of cloud-init,
 refer to https://cloudinit.readthedocs.io/en/latest/topics/instancedata.html.
 
-These APIs also support the parameter ``userdata=`` to provide the userdata content
+These APIs also support the parameter ``userdata=`` to provide the user data content
 directly. The value for this parameter must be a `base64 <https://www.base64encode.org/>`_-encoded
 multi-part MIME message. See further below for an example of what this should look like.
 
-The registered UserData can be linked to a Template or ISO on registration/upload/editing
-using linkUserDataToTemplate API. The same API can be used to unlink the mapping of userdata and Template.
+The registered User Data can be linked to a Template or ISO on registration/upload/editing
+using linkUserDataToTemplate API. The same API can be used to unlink the mapping of user data and Template.
 
-While linking userData to a Template/ISO userdata override policy has to be specified.
+While linking user Data to a Template/ISO user data override policy has to be specified.
 Following are the override policies available: 
 
-Allow Override: Allow users to override UserData for the Template during instance deployment or on reset.
+Allow Override: Allow users to override User Data for the Template during instance deployment or on reset.
                 This is the default override policy if not specified 
 
-Deny Override: Override of UserData isn’t allowed during instance deployment or on reset.
+Deny Override: Override of User Data isn’t allowed during instance deployment or on reset.
 
-Append Only: Don’t allow users to override linked UserData but allow users to pass userdata content 
-             or ID that should be appended to the linked UserData of the Template. When the users pass userdata it is appended to the Template userdata in the form of a multipart MIME message
+Append Only: Don’t allow users to override linked User Data but allow users to pass user data content
+             or ID that should be appended to the linked User Data of the Template. When the users pass user data it is appended to the Template user data in the form of a multipart MIME message
 
 This is how it looks like in Template/ISO register/upload/edit forms.
 
 .. image:: /_static/images/userdata_template_link.png
    :width: 400px
    :align: center
-   :alt: Linking userdata to template/ISO
+   :alt: Linking user data to template/ISO
 
 Based on these override policies, "Add Instance" UI form provides relevant options to either
-override or append. If it is "Deny Override" then "Add Instance" will not allow adding user specific userdata
+override or append. If it is "Deny Override" then "Add Instance" will not allow adding user specific user data
 
-Storing and accessing userdata
+Storing and accessing user data
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 HTTP GET parameters are limited to a length of 2048 bytes, but it is possible
 to store larger user-data blobs by sending them in the body via HTTP POST
 instead of GET.
 
 From inside the instance, the user-data is accessible via the virtual router,
-if the UserData service is enabled on the network offering.
+if the User Data service is enabled on the network offering.
 
 If you are using the DNS service of the virtual router, a special hostname
 called `data-server.` is provided, that will point to a valid user-data server.
 
 Otherwise you have to determine the virtual router address via other means,
 such as DHCP leases. Be careful to scan all routers if you have multiple
-networks attached to an instance, in case not all of them have the UserData service
+networks attached to an instance, in case not all of them have the User Data service
 enabled.
 
 User-data is available from the URL ``http://data-server./latest/user-data``
@@ -224,8 +224,8 @@ Custom user-data example
 
 This example uses cloud-init to automatically update all OS packages on the first launch.
 
-#. Register the following user-data in CloudStack. If APIs are used to register userdata or to
-   provide direct userdata text then userdata needs to be wrapped into a multi-part MIME message
+#. Register the following user-data in CloudStack. If APIs are used to register user data or to
+   provide direct user data text then user data needs to be wrapped into a multi-part MIME message
    and encoded in base64:
 
    .. code:: bash
@@ -250,18 +250,18 @@ This example uses cloud-init to automatically update all OS packages on the firs
       package_upgrade: true
       EOF
    
-#. Deploy an instance with this user-data either by providing the UUID of the registerd userdata
-   or by providing base64 encoded userdata:
+#. Deploy an instance with this user-data either by providing the UUID of the registerd user data
+   or by providing base64 encoded user data:
 
    .. code:: bash
 
       cmk deploy virtualmachine name=..... userdata=Q29udGVudC1UeXBlOiBtdWx0aXBhcnQvbWl4ZWQ7IGJvdW5kYXJ5PSIvLyIKTUlNRS1WZXJzaW9uOiAxLjAKCi0tLy8KQ29udGVudC1UeXBlOiB0ZXh0L2Nsb3VkLWNvbmZpZzsgY2hhcnNldD0idXMtYXNjaWkiCk1JTUUtVmVyc2lvbjogMS4wCkNvbnRlbnQtVHJhbnNmZXItRW5jb2Rpbmc6IDdiaXQKQ29udGVudC1EaXNwb3NpdGlvbjogYXR0YWNobWVudDsgZmlsZW5hbWU9ImNsb3VkLWNvbmZpZy50eHQiCgojY2xvdWQtY29uZmlnCgojIFVwZ3JhZGUgdGhlIGluc3RhbmNlIG9uIGZpcnN0IGJvb3QKIyAoaWUgcnVuIGFwdC1nZXQgdXBncmFkZSkKIwojIERlZmF1bHQ6IGZhbHNlCiMgQWxpYXNlczogYXB0X3VwZ3JhZGUKcGFja2FnZV91cGdyYWRlOiB0cnVlCg==
 
    .. code:: bash
 
-      cmk deploy virtualmachine name=..... userdataid=<Userdata UUID>
+      cmk deploy virtualmachine name=..... userdataid=<User data UUID>
 
-.. note:: When using multipart userdata, cloud-init expects userdata format of one particular type only in one multipart section.
+.. note:: When using multipart user data, cloud-init expects user data format of one particular type only in one multipart section.
 
 Disclaimer
 ~~~~~~~~~~

source/conceptsandterminology/network_setup.rst

@@ -55,7 +55,7 @@ VPN support                No                                   Yes
 Port forwarding            Physical                             Physical and Virtual
 1:1 NAT                    Physical                             Physical and Virtual
 Source NAT                 No                                   Physical and Virtual
-Userdata                   Yes                                  Yes
+User data                  Yes                                 Yes
 Network usage monitoring   sFlow / netFlow at physical router   Hypervisor and Virtual Router
 DNS and DHCP               Yes                                  Yes
 =========================  ===================================  ===============================

source/plugins/ipv6.rst

@@ -101,7 +101,7 @@ The following are not yet supported:
 
 #. Security groups
 
-#. Userdata and metadata
+#. User data and metadata
 
 #. Passwords
 

source/plugins/nsx-plugin.rst

@@ -28,7 +28,7 @@ The VMware NSX Plugin introduces VMware NSX 4 as a network service provider in C
 - Port Forwarding between “public” networks and VPC network tier
 - External load balancing – between VPCs network tiers and “public” networks (runs on Edge Cluster)
 - Internal load balancing – between VPC network tiers
-- Password injection, UserData and SSH Keys
+- Password injection, User Data and SSH Keys
 - External, Internal DNS
 - DHCP
 - Kubernetes host orchestration, supporting CKS on VPCs