Merge pull request #3514 from AlanCoding/azure_huzzah

Enable azure_rm inventory plugin

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]

awx/main/models/inventory.py

@@ -1959,8 +1959,7 @@ class PluginFileInjector(object):
 
 class azure_rm(PluginFileInjector):
     plugin_name = 'azure_rm'
-    # FIXME: https://github.com/ansible/ansible/issues/54065 need resolving to enable
-    # initial_version = '2.8'  # Driven by unsafe group names issue, hostvars
+    initial_version = '2.8'  # Driven by unsafe group names issue, hostvars, host names
     ini_env_reference = 'AZURE_INI_PATH'
     base_injector = 'managed'
 
@@ -2003,6 +2002,8 @@ class azure_rm(PluginFileInjector):
         # TODO: add proper support for group_by non-specific to compatibility
         # Dashes were not configurable in azure_rm.py script, we do not want unicode, so always use this
         ret['use_contrib_script_compatible_sanitization'] = True
+        # use same host names as script
+        ret['plain_host_names'] = True
         # By default the script did not filter hosts 
         ret['default_host_filters'] = []
         # User-given host filters

awx/main/tests/data/inventory/plugins/azure_rm/files/azure_rm.yml

@@ -31,5 +31,6 @@ keyed_groups:
 - key: dict(tags.keys() | map("regex_replace", "^(.*)$", "\1_") | list | zip(tags.values() | list)) if tags else []
   prefix: ''
   separator: ''
+plain_host_names: true
 plugin: azure_rm
 use_contrib_script_compatible_sanitization: true