Merging upstream version 10.0.0+dfsg.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 24 insertions, 5 deletions

diff --git a/ansible_collections/azure/azcollection/plugins/doc_fragments/azure.py b/ansible_collections/azure/azcollection/plugins/doc_fragments/azure.py
index bc382e401..74c1286ac 100644
--- a/ansible_collections/azure/azcollection/plugins/doc_fragments/azure.py
+++ b/ansible_collections/azure/azcollection/plugins/doc_fragments/azure.py
@@ -34,7 +34,8 @@ options:
         type: str
     client_id:
         description:
-            - Azure client ID. Use when authenticating with a Service Principal.
+            - Azure client ID. Use when authenticating with a Service Principal or Managed Identity (msi).
+            - Can also be set via the C(AZURE_CLIENT_ID) environment variable.
         type: str
     secret:
         description:
@@ -65,6 +66,19 @@ options:
         type: str
         choices: [ ignore, validate ]
         version_added: '0.0.1'
+    disable_instance_discovery:
+        description:
+            - Determines whether or not instance discovery is performed when attempting to authenticate.
+              Setting this to true will completely disable both instance discovery and authority validation.
+              This functionality is intended for use in scenarios where the metadata endpoint cannot be reached
+              such as in private clouds or Azure Stack. The process of instance discovery entails retrieving
+              authority metadata from https://login.microsoft.com/ to validate the authority. By setting this
+              to **True**, the validation of the authority is disabled. As a result, it is crucial to ensure
+              that the configured authority host is valid and trustworthy.
+            - Set via credential file profile or the C(AZURE_DISABLE_INSTANCE_DISCOVERY) environment variable.
+        type: bool
+        default: False
+        version_added: '2.3.0'
     auth_source:
         description:
             - Controls the source of the credentials to use for authentication.
diff --git a/ansible_collections/azure/azcollection/plugins/doc_fragments/azure_rm.py b/ansible_collections/azure/azcollection/plugins/doc_fragments/azure_rm.py
index 8d860d863..6677137a1 100644
--- a/ansible_collections/azure/azcollection/plugins/doc_fragments/azure_rm.py
+++ b/ansible_collections/azure/azcollection/plugins/doc_fragments/azure_rm.py
@@ -47,6 +47,11 @@ options:
             expression in the list is evaluated for each host; when the expression is true, the host is excluded
             from the inventory.
         default: []
+    include_host_filters:
+        description: Include hosts from the inventory with a list of Jinja2 conditional expressions. Each
+            expression in the list is evaluated for each host; when the expression is true, the host is included
+            in the inventory, all hosts are includes in the inventory by default.
+        default: [true]
     batch_fetch:
         description: To improve performance, results are fetched using an unsupported batch API. Disabling
             C(batch_fetch) uses a much slower serial fetch, resulting in many more round-trips. Generally only
@@ -61,8 +66,8 @@ options:
         description:
         - By default this plugin is using a general group name sanitization to create safe and usable group names for use in Ansible.
             This option allows you to override that, in efforts to allow migration from the old inventory script and
-            matches the sanitization of groups when the script's ``replace_dash_in_groups`` option is set to ``False``.
-            To replicate behavior of ``replace_dash_in_groups = True`` with constructed groups,
+            matches the sanitization of groups when the script's C(replace_dash_in_groups) option is set to C(false).
+            To replicate behavior of C(replace_dash_in_groups = true) with constructed groups,
             you will need to replace hyphens with underscores via the regex_replace filter for those entries.
         - For this to work you should also turn off the TRANSFORM_INVALID_GROUP_CHARS setting,
             otherwise the core engine will just use the standard sanitization on top.
@@ -86,9 +91,9 @@ options:
         - Ignores expression if result is an empty string or None value.
         - By default, inventory_hostname is generated to be globally unique based on the VM host name.
             See C(plain_host_names) for more details on the default.
-        - An expression of 'default' will force using the default hostname generator if no previous hostname expression
+        - An expression of C(default) will force using the default hostname generator if no previous hostname expression
             resulted in a valid hostname.
-        - Use ``default_inventory_hostname`` to access the default hostname generator's value in any of the Jinja2 expressions.
+        - Use C(default_inventory_hostname) to access the default hostname generator's value in any of the Jinja2 expressions.
         type: list
         elements: str
         default: [default]