mirror of
https://github.com/ansible/awx.git
synced 2026-03-10 14:09:28 -02:30
Merge pull request #8718 from chrismeyersfsu/fix-inv_migration
add missing imports Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
@@ -1,9 +1,13 @@
|
|||||||
import json
|
import json
|
||||||
|
import re
|
||||||
|
import logging
|
||||||
|
|
||||||
from django.utils.translation import ugettext_lazy as _
|
from django.utils.translation import ugettext_lazy as _
|
||||||
|
from django.utils.encoding import iri_to_uri
|
||||||
|
|
||||||
|
|
||||||
FrozenInjectors = dict()
|
FrozenInjectors = dict()
|
||||||
|
logger = logging.getLogger('awx.main.migrations')
|
||||||
|
|
||||||
|
|
||||||
class PluginFileInjector(object):
|
class PluginFileInjector(object):
|
||||||
@@ -129,6 +133,7 @@ class azure_rm(PluginFileInjector):
|
|||||||
ret['exclude_host_filters'].append("location not in {}".format(repr(python_regions)))
|
ret['exclude_host_filters'].append("location not in {}".format(repr(python_regions)))
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
class ec2(PluginFileInjector):
|
class ec2(PluginFileInjector):
|
||||||
plugin_name = 'aws_ec2'
|
plugin_name = 'aws_ec2'
|
||||||
namespace = 'amazon'
|
namespace = 'amazon'
|
||||||
@@ -586,6 +591,7 @@ class openstack(PluginFileInjector):
|
|||||||
ret['inventory_hostname'] = use_host_name_for_name(source_vars['use_hostnames'])
|
ret['inventory_hostname'] = use_host_name_for_name(source_vars['use_hostnames'])
|
||||||
return ret
|
return ret
|
||||||
|
|
||||||
|
|
||||||
class rhv(PluginFileInjector):
|
class rhv(PluginFileInjector):
|
||||||
"""ovirt uses the custom credential templating, and that is all
|
"""ovirt uses the custom credential templating, and that is all
|
||||||
"""
|
"""
|
||||||
|
|||||||
Reference in New Issue
Block a user