External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-18 06:47:41 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6191 from ryanpetrello/fix-credential-migration

Browse Source 
fix broken credential type migration upgrade
This commit is contained in:
Ryan Petrello
2017-05-05 14:56:35 -04:00
committed by GitHub
parent 0522e27a66 422a62fb34
commit 3ed9ebed89
2 changed files with 8 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
awx/main/migrations/0040_v320_add_credentialtype_model.py
View File

@@ -71,14 +71,4 @@ class Migration(migrations.Migration):
name='credential_type', name='credential_type',
field=models.ManyToManyField(to='main.CredentialType', blank=True), field=models.ManyToManyField(to='main.CredentialType', blank=True),
), ),
migrations.AlterField(
model_name='credential',
name='credential_type',
field=models.ForeignKey(related_name='credentials', to='main.CredentialType', help_text='Type for this credential. Credential Types define valid fields (e.g,. "username", "password") and their properties (e.g,. "username is required" or "password should be stored with encryption").'),
),
migrations.AlterField(
model_name='credential',
name='inputs',
field=awx.main.fields.CredentialInputField(default={}, help_text='Data structure used to specify input values (e.g., {"username": "jane-doe", "password": "secret"}). Valid fields and their requirements vary depending on the fields defined on the chosen CredentialType.', blank=True),
),
] ]

10
awx/main/migrations/0042_v320_drop_v1_credential_fields.py
View File

@@ -2,6 +2,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations, models from django.db import migrations, models
import awx.main.fields
class Migration(migrations.Migration): class Migration(migrations.Migration):
@@ -98,6 +99,11 @@ class Migration(migrations.Migration):
migrations.AlterField( migrations.AlterField(
model_name='credential', model_name='credential',
name='credential_type', name='credential_type',
field=models.ForeignKey(related_name='credentials', to='main.CredentialType', null=False) field=models.ForeignKey(related_name='credentials', to='main.CredentialType', null=False, help_text='Type for this credential. Credential Types define valid fields (e.g,. "username", "password") and their properties (e.g,. "username is required" or "password should be stored with encryption").')
) ),
migrations.AlterField(
model_name='credential',
name='inputs',
field=awx.main.fields.CredentialInputField(default={}, help_text='Data structure used to specify input values (e.g., {"username": "jane-doe", "password": "secret"}). Valid fields and their requirements vary depending on the fields defined on the chosen CredentialType.', blank=True),
),
] ]