Allow for userdata_template to be disabled in a cloud_profile

This handles the case where a global value has been set and it is
necessary to disable it for a single profile.

doc/topics/cloud/aws.rst

@@ -373,6 +373,16 @@ functionality was added to Salt in the 2015.5.0 release.
     If this is not set, then no templating will be performed on the
     userdata_file.
 
+    To disable templating in a cloud profile when a
+    :conf_master:`userdata_template` has been set in the master configuration
+    file, simply set ``userdata_template`` to ``False`` in the cloud profile:
+
+    .. code-block:: yaml
+
+        my-ec2-config:
+          # Pass userdata to the instance to be created
+          userdata_file: /etc/salt/my-userdata-file
+          userdata_template: False
 
 EC2 allows a location to be set for servers to be deployed in. Availability
 zones exist inside regions, and may be added to increase specificity.

doc/topics/cloud/openstack.rst

@@ -172,3 +172,14 @@ cloud-init if available.
     configuration will be checked for a :conf_master:`userdata_template` value.
     If this is not set, then no templating will be performed on the
     userdata_file.
+
+    To disable templating in a cloud profile when a
+    :conf_master:`userdata_template` has been set in the master configuration
+    file, simply set ``userdata_template`` to ``False`` in the cloud profile:
+
+    .. code-block:: yaml
+
+        my-openstack-config:
+          # Pass userdata to the instance to be created
+          userdata_file: /etc/salt/cloud-init/packages.yml
+          userdata_template: False

doc/topics/cloud/windows.rst

@@ -96,6 +96,17 @@ profile configuration as `userdata_file`. For instance:
     If this is not set, then no templating will be performed on the
     userdata_file.
 
+    To disable templating in a cloud profile when a
+    :conf_master:`userdata_template` has been set in the master configuration
+    file, simply set ``userdata_template`` to ``False`` in the cloud profile:
+
+    .. code-block:: yaml
+
+        my-ec2-config:
+          # Pass userdata to the instance to be created
+          userdata_file: /etc/salt/windows-firewall.ps1
+          userdata_template: False
+
 
 If you are using WinRM on EC2 the HTTPS port for the WinRM service must also be
 enabled in your userdata. By default EC2 Windows images only have insecure HTTP

salt/utils/cloud.py

@@ -3222,6 +3222,8 @@ def userdata_template(opts, vm_, userdata):
     userdata_template = salt.config.get_cloud_config_value(
         'userdata_template', vm_, opts, search_global=False, default=None
     )
+    if userdata_template is False:
+        return userdata
     # Use the cloud profile's userdata_template, otherwise get it from the
     # master configuration file.
     renderer = opts.get('userdata_template') \