sync tower verify_ssl parameter with tower-cli

Add new input for the tower type credential
elsewhere, tests are being added for verify_ssl in modules
tower-cli also updating to use the original tower.py var
This commit is contained in:
AlanCoding
2018-03-19 09:30:47 -04:00
parent e58038b056
commit 9db0fdfc0b
4 changed files with 40 additions and 1 deletions

View File

@@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
# AWX
from awx.main.migrations import _credentialtypes as credentialtypes
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('main', '0026_v330_emitted_events'),
]
operations = [
migrations.RunPython(credentialtypes.add_tower_verify_field),
]

View File

@@ -184,6 +184,14 @@ def create_rhv_tower_credtype(apps, schema_editor):
CredentialType.setup_tower_managed_defaults()
def add_tower_verify_field(apps, schema_editor):
tower_credtype = CredentialType.objects.get(
kind='cloud', name='Ansible Tower', managed_by_tower=True
)
tower_credtype.inputs = CredentialType.defaults.get('tower')().inputs
tower_credtype.save()
def add_azure_cloud_environment_field(apps, schema_editor):
azure_rm_credtype = CredentialType.objects.get(kind='cloud',
name='Microsoft Azure Resource Manager')

View File

@@ -1181,6 +1181,11 @@ def tower(cls):
'label': 'Password',
'type': 'string',
'secret': True,
}, {
'id': 'verify_ssl',
'label': 'Verify SSL',
'type': 'boolean',
'secret': False
}],
'required': ['host', 'username', 'password'],
},
@@ -1189,6 +1194,7 @@ def tower(cls):
'TOWER_HOST': '{{host}}',
'TOWER_USERNAME': '{{username}}',
'TOWER_PASSWORD': '{{password}}',
'TOWER_VERIFY_SSL': '{{verify_ssl}}'
}
},
)