mirror of
https://github.com/ZwareBear/awx.git
synced 2026-03-20 07:43:35 -05:00
pushing limit to inventory sources
This commit is contained in:
@@ -79,4 +79,14 @@ class Migration(migrations.Migration):
|
|||||||
max_length=32,
|
max_length=32,
|
||||||
),
|
),
|
||||||
),
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='inventorysource',
|
||||||
|
name='limit',
|
||||||
|
field=models.TextField(blank=True, default='', help_text='Enter host, group or pattern match'),
|
||||||
|
),
|
||||||
|
migrations.AddField(
|
||||||
|
model_name='inventoryupdate',
|
||||||
|
name='limit',
|
||||||
|
field=models.TextField(blank=True, default='', help_text='Enter host, group or pattern match'),
|
||||||
|
),
|
||||||
]
|
]
|
||||||
|
|||||||
@@ -925,7 +925,7 @@ class InventorySourceOptions(BaseModel):
|
|||||||
host_filter = models.TextField(
|
host_filter = models.TextField(
|
||||||
blank=True,
|
blank=True,
|
||||||
default='',
|
default='',
|
||||||
help_text=_('Regex where only matching hosts will be imported.'),
|
help_text=_('This field is deprecated and will be removed in a future release. Regex where only matching hosts will be imported.'),
|
||||||
)
|
)
|
||||||
overwrite = models.BooleanField(
|
overwrite = models.BooleanField(
|
||||||
default=False,
|
default=False,
|
||||||
@@ -945,6 +945,11 @@ class InventorySourceOptions(BaseModel):
|
|||||||
blank=True,
|
blank=True,
|
||||||
default=1,
|
default=1,
|
||||||
)
|
)
|
||||||
|
limit = models.TextField(
|
||||||
|
blank=True,
|
||||||
|
default='',
|
||||||
|
help_text=_("Enter host, group or pattern match"),
|
||||||
|
)
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
def cloud_credential_validation(source, cred):
|
def cloud_credential_validation(source, cred):
|
||||||
|
|||||||
@@ -1539,6 +1539,11 @@ class RunInventoryUpdate(SourceControlMixin, BaseTask):
|
|||||||
|
|
||||||
args.append('-i')
|
args.append('-i')
|
||||||
args.append(container_location)
|
args.append(container_location)
|
||||||
|
# Added this in order to allow older versions of ansible-inventory https://github.com/ansible/ansible/pull/79596
|
||||||
|
# limit should be usable in ansible-inventory 2.15+
|
||||||
|
if inventory_update.limit:
|
||||||
|
args.append('--limit')
|
||||||
|
args.append(inventory_update.limit)
|
||||||
|
|
||||||
args.append('--output')
|
args.append('--output')
|
||||||
args.append(os.path.join(CONTAINER_ROOT, 'artifacts', str(inventory_update.id), 'output.json'))
|
args.append(os.path.join(CONTAINER_ROOT, 'artifacts', str(inventory_update.id), 'output.json'))
|
||||||
|
|||||||
Reference in New Issue
Block a user