External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-26 15:36:04 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1962 from ryanpetrello/i18n-credentials

Browse Source 
mark dynamic Credential Type labels and help_text for i18n
This commit is contained in:
Ryan Petrello
2018-05-25 16:31:09 -04:00
committed by GitHub
parent b5cb4e8290 e03c584b80
commit fc1077b9cb
2 changed files with 111 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
awx/api/serializers.py
View File

@@ -2363,6 +2363,7 @@ class CredentialTypeSerializer(BaseSerializer):
# translate labels and help_text for credential fields "managed by Tower" # translate labels and help_text for credential fields "managed by Tower"
if value.get('managed_by_tower'): if value.get('managed_by_tower'):
value['name'] = _(value['name'])
for field in value.get('inputs', {}).get('fields', []): for field in value.get('inputs', {}).get('fields', []):
field['label'] = _(field['label']) field['label'] = _(field['label'])
if 'help_text' in field: if 'help_text' in field:

220
awx/main/models/credential/__init__.py
View File

@@ -14,7 +14,7 @@ from jinja2 import Template
# Django # Django
from django.db import models from django.db import models
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _, ugettext_noop
from django.core.exceptions import ValidationError from django.core.exceptions import ValidationError
from django.utils.encoding import force_text from django.utils.encoding import force_text
@@ -673,46 +673,46 @@ class CredentialType(CommonModelNameNotUnique):
def ssh(cls): def ssh(cls):
return cls( return cls(
kind='ssh', kind='ssh',
name='Machine', name=ugettext_noop('Machine'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'ask_at_runtime': True 'ask_at_runtime': True
}, { }, {
'id': 'ssh_key_data', 'id': 'ssh_key_data',
'label': 'SSH Private Key', 'label': ugettext_noop('SSH Private Key'),
'type': 'string', 'type': 'string',
'format': 'ssh_private_key', 'format': 'ssh_private_key',
'secret': True, 'secret': True,
'multiline': True 'multiline': True
}, { }, {
'id': 'ssh_key_unlock', 'id': 'ssh_key_unlock',
'label': 'Private Key Passphrase', 'label': ugettext_noop('Private Key Passphrase'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'ask_at_runtime': True 'ask_at_runtime': True
}, { }, {
'id': 'become_method', 'id': 'become_method',
'label': 'Privilege Escalation Method', 'label': ugettext_noop('Privilege Escalation Method'),
'type': 'become_method', 'type': 'become_method',
'help_text': ('Specify a method for "become" operations. This is ' 'help_text': ugettext_noop('Specify a method for "become" operations. This is '
'equivalent to specifying the --become-method ' 'equivalent to specifying the --become-method '
'Ansible parameter.') 'Ansible parameter.')
}, { }, {
'id': 'become_username', 'id': 'become_username',
'label': 'Privilege Escalation Username', 'label': ugettext_noop('Privilege Escalation Username'),
'type': 'string', 'type': 'string',
}, { }, {
'id': 'become_password', 'id': 'become_password',
'label': 'Privilege Escalation Password', 'label': ugettext_noop('Privilege Escalation Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'ask_at_runtime': True 'ask_at_runtime': True
@@ -728,28 +728,28 @@ def ssh(cls):
def scm(cls): def scm(cls):
return cls( return cls(
kind='scm', kind='scm',
name='Source Control', name=ugettext_noop('Source Control'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True 'secret': True
}, { }, {
'id': 'ssh_key_data', 'id': 'ssh_key_data',
'label': 'SCM Private Key', 'label': ugettext_noop('SCM Private Key'),
'type': 'string', 'type': 'string',
'format': 'ssh_private_key', 'format': 'ssh_private_key',
'secret': True, 'secret': True,
'multiline': True 'multiline': True
}, { }, {
'id': 'ssh_key_unlock', 'id': 'ssh_key_unlock',
'label': 'Private Key Passphrase', 'label': ugettext_noop('Private Key Passphrase'),
'type': 'string', 'type': 'string',
'secret': True 'secret': True
}], }],
@@ -764,25 +764,25 @@ def scm(cls):
def vault(cls): def vault(cls):
return cls( return cls(
kind='vault', kind='vault',
name='Vault', name=ugettext_noop('Vault'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'vault_password', 'id': 'vault_password',
'label': 'Vault Password', 'label': ugettext_noop('Vault Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'ask_at_runtime': True 'ask_at_runtime': True
}, { }, {
'id': 'vault_id', 'id': 'vault_id',
'label': 'Vault Identifier', 'label': ugettext_noop('Vault Identifier'),
'type': 'string', 'type': 'string',
'format': 'vault_id', 'format': 'vault_id',
'help_text': ('Specify an (optional) Vault ID. This is ' 'help_text': ugettext_noop('Specify an (optional) Vault ID. This is '
'equivalent to specifying the --vault-id ' 'equivalent to specifying the --vault-id '
'Ansible parameter for providing multiple Vault ' 'Ansible parameter for providing multiple Vault '
'passwords. Note: this feature only works in ' 'passwords. Note: this feature only works in '
'Ansible 2.4+.') 'Ansible 2.4+.')
}], }],
'required': ['vault_password'], 'required': ['vault_password'],
} }
@@ -793,37 +793,37 @@ def vault(cls):
def net(cls): def net(cls):
return cls( return cls(
kind='net', kind='net',
name='Network', name=ugettext_noop('Network'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'ssh_key_data', 'id': 'ssh_key_data',
'label': 'SSH Private Key', 'label': ugettext_noop('SSH Private Key'),
'type': 'string', 'type': 'string',
'format': 'ssh_private_key', 'format': 'ssh_private_key',
'secret': True, 'secret': True,
'multiline': True 'multiline': True
}, { }, {
'id': 'ssh_key_unlock', 'id': 'ssh_key_unlock',
'label': 'Private Key Passphrase', 'label': ugettext_noop('Private Key Passphrase'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'authorize', 'id': 'authorize',
'label': 'Authorize', 'label': ugettext_noop('Authorize'),
'type': 'boolean', 'type': 'boolean',
}, { }, {
'id': 'authorize_password', 'id': 'authorize_password',
'label': 'Authorize Password', 'label': ugettext_noop('Authorize Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}], }],
@@ -840,27 +840,27 @@ def net(cls):
def aws(cls): def aws(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Amazon Web Services', name=ugettext_noop('Amazon Web Services'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Access Key', 'label': ugettext_noop('Access Key'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Secret Key', 'label': ugettext_noop('Secret Key'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'security_token', 'id': 'security_token',
'label': 'STS Token', 'label': ugettext_noop('STS Token'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
'help_text': ('Security Token Service (STS) is a web service ' 'help_text': ugettext_noop('Security Token Service (STS) is a web service '
'that enables you to request temporary, ' 'that enables you to request temporary, '
'limited-privilege credentials for AWS Identity ' 'limited-privilege credentials for AWS Identity '
'and Access Management (IAM) users.'), 'and Access Management (IAM) users.'),
}], }],
'required': ['username', 'password'] 'required': ['username', 'password']
} }
@@ -871,36 +871,36 @@ def aws(cls):
def openstack(cls): def openstack(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='OpenStack', name=ugettext_noop('OpenStack'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password (API Key)', 'label': ugettext_noop('Password (API Key)'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'host', 'id': 'host',
'label': 'Host (Authentication URL)', 'label': ugettext_noop('Host (Authentication URL)'),
'type': 'string', 'type': 'string',
'help_text': ('The host to authenticate with. For example, ' 'help_text': ugettext_noop('The host to authenticate with. For example, '
'https://openstack.business.com/v2.0/') 'https://openstack.business.com/v2.0/')
}, { }, {
'id': 'project', 'id': 'project',
'label': 'Project (Tenant Name)', 'label': ugettext_noop('Project (Tenant Name)'),
'type': 'string', 'type': 'string',
}, { }, {
'id': 'domain', 'id': 'domain',
'label': 'Domain Name', 'label': ugettext_noop('Domain Name'),
'type': 'string', 'type': 'string',
'help_text': ('OpenStack domains define administrative boundaries. ' 'help_text': ugettext_noop('OpenStack domains define administrative boundaries. '
'It is only needed for Keystone v3 authentication ' 'It is only needed for Keystone v3 authentication '
'URLs. Refer to Ansible Tower documentation for ' 'URLs. Refer to Ansible Tower documentation for '
'common scenarios.') 'common scenarios.')
}], }],
'required': ['username', 'password', 'host', 'project'] 'required': ['username', 'password', 'host', 'project']
} }
@@ -911,22 +911,22 @@ def openstack(cls):
def vmware(cls): def vmware(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='VMware vCenter', name=ugettext_noop('VMware vCenter'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'host', 'id': 'host',
'label': 'VCenter Host', 'label': ugettext_noop('VCenter Host'),
'type': 'string', 'type': 'string',
'help_text': ('Enter the hostname or IP address that corresponds ' 'help_text': ugettext_noop('Enter the hostname or IP address that corresponds '
'to your VMware vCenter.') 'to your VMware vCenter.')
}, { }, {
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}], }],
@@ -939,22 +939,22 @@ def vmware(cls):
def satellite6(cls): def satellite6(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Red Hat Satellite 6', name=ugettext_noop('Red Hat Satellite 6'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'host', 'id': 'host',
'label': 'Satellite 6 URL', 'label': ugettext_noop('Satellite 6 URL'),
'type': 'string', 'type': 'string',
'help_text': ('Enter the URL that corresponds to your Red Hat ' 'help_text': ugettext_noop('Enter the URL that corresponds to your Red Hat '
'Satellite 6 server. For example, https://satellite.example.org') 'Satellite 6 server. For example, https://satellite.example.org')
}, { }, {
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}], }],
@@ -967,23 +967,23 @@ def satellite6(cls):
def cloudforms(cls): def cloudforms(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Red Hat CloudForms', name=ugettext_noop('Red Hat CloudForms'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'host', 'id': 'host',
'label': 'CloudForms URL', 'label': ugettext_noop('CloudForms URL'),
'type': 'string', 'type': 'string',
'help_text': ('Enter the URL for the virtual machine that ' 'help_text': ugettext_noop('Enter the URL for the virtual machine that '
'corresponds to your CloudForm instance. ' 'corresponds to your CloudForm instance. '
'For example, https://cloudforms.example.org') 'For example, https://cloudforms.example.org')
}, { }, {
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}], }],
@@ -996,32 +996,32 @@ def cloudforms(cls):
def gce(cls): def gce(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Google Compute Engine', name=ugettext_noop('Google Compute Engine'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Service Account Email Address', 'label': ugettext_noop('Service Account Email Address'),
'type': 'string', 'type': 'string',
'help_text': ('The email address assigned to the Google Compute ' 'help_text': ugettext_noop('The email address assigned to the Google Compute '
'Engine service account.') 'Engine service account.')
}, { }, {
'id': 'project', 'id': 'project',
'label': 'Project', 'label': 'Project',
'type': 'string', 'type': 'string',
'help_text': ('The Project ID is the GCE assigned identification. ' 'help_text': ugettext_noop('The Project ID is the GCE assigned identification. '
'It is often constructed as three words or two words ' 'It is often constructed as three words or two words '
'followed by a three-digit number. Examples: project-id-000 ' 'followed by a three-digit number. Examples: project-id-000 '
'and another-project-id') 'and another-project-id')
}, { }, {
'id': 'ssh_key_data', 'id': 'ssh_key_data',
'label': 'RSA Private Key', 'label': ugettext_noop('RSA Private Key'),
'type': 'string', 'type': 'string',
'format': 'ssh_private_key', 'format': 'ssh_private_key',
'secret': True, 'secret': True,
'multiline': True, 'multiline': True,
'help_text': ('Paste the contents of the PEM file associated ' 'help_text': ugettext_noop('Paste the contents of the PEM file associated '
'with the service account email.') 'with the service account email.')
}], }],
'required': ['username', 'ssh_key_data'], 'required': ['username', 'ssh_key_data'],
} }
@@ -1032,43 +1032,43 @@ def gce(cls):
def azure_rm(cls): def azure_rm(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Microsoft Azure Resource Manager', name=ugettext_noop('Microsoft Azure Resource Manager'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'subscription', 'id': 'subscription',
'label': 'Subscription ID', 'label': ugettext_noop('Subscription ID'),
'type': 'string', 'type': 'string',
'help_text': ('Subscription ID is an Azure construct, which is ' 'help_text': ugettext_noop('Subscription ID is an Azure construct, which is '
'mapped to a username.') 'mapped to a username.')
}, { }, {
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'client', 'id': 'client',
'label': 'Client ID', 'label': ugettext_noop('Client ID'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'secret', 'id': 'secret',
'label': 'Client Secret', 'label': ugettext_noop('Client Secret'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'tenant', 'id': 'tenant',
'label': 'Tenant ID', 'label': ugettext_noop('Tenant ID'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'cloud_environment', 'id': 'cloud_environment',
'label': 'Azure Cloud Environment', 'label': ugettext_noop('Azure Cloud Environment'),
'type': 'string', 'type': 'string',
'help_text': ('Environment variable AZURE_CLOUD_ENVIRONMENT when' 'help_text': ugettext_noop('Environment variable AZURE_CLOUD_ENVIRONMENT when'
' using Azure GovCloud or Azure stack.') ' using Azure GovCloud or Azure stack.')
}], }],
'required': ['subscription'], 'required': ['subscription'],
} }
@@ -1079,16 +1079,16 @@ def azure_rm(cls):
def insights(cls): def insights(cls):
return cls( return cls(
kind='insights', kind='insights',
name='Insights', name=ugettext_noop('Insights'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True 'secret': True
}], }],
@@ -1107,28 +1107,28 @@ def insights(cls):
def rhv(cls): def rhv(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Red Hat Virtualization', name=ugettext_noop('Red Hat Virtualization'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'host', 'id': 'host',
'label': 'Host (Authentication URL)', 'label': ugettext_noop('Host (Authentication URL)'),
'type': 'string', 'type': 'string',
'help_text': ('The host to authenticate with.') 'help_text': ugettext_noop('The host to authenticate with.')
}, { }, {
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'ca_file', 'id': 'ca_file',
'label': 'CA File', 'label': ugettext_noop('CA File'),
'type': 'string', 'type': 'string',
'help_text': ('Absolute file path to the CA file to use (optional)') 'help_text': ugettext_noop('Absolute file path to the CA file to use (optional)')
}], }],
'required': ['host', 'username', 'password'], 'required': ['host', 'username', 'password'],
}, },
@@ -1159,26 +1159,26 @@ def rhv(cls):
def tower(cls): def tower(cls):
return cls( return cls(
kind='cloud', kind='cloud',
name='Ansible Tower', name=ugettext_noop('Ansible Tower'),
managed_by_tower=True, managed_by_tower=True,
inputs={ inputs={
'fields': [{ 'fields': [{
'id': 'host', 'id': 'host',
'label': 'Ansible Tower Hostname', 'label': ugettext_noop('Ansible Tower Hostname'),
'type': 'string', 'type': 'string',
'help_text': ('The Ansible Tower base URL to authenticate with.') 'help_text': ugettext_noop('The Ansible Tower base URL to authenticate with.')
}, { }, {
'id': 'username', 'id': 'username',
'label': 'Username', 'label': ugettext_noop('Username'),
'type': 'string' 'type': 'string'
}, { }, {
'id': 'password', 'id': 'password',
'label': 'Password', 'label': ugettext_noop('Password'),
'type': 'string', 'type': 'string',
'secret': True, 'secret': True,
}, { }, {
'id': 'verify_ssl', 'id': 'verify_ssl',
'label': 'Verify SSL', 'label': ugettext_noop('Verify SSL'),
'type': 'boolean', 'type': 'boolean',
'secret': False 'secret': False
}], }],