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

[constructed-inventory] Use control plane EE for constructed inventory and hack temporary image (#13474)

Browse Source 
* Use control plane EE for constructed inventory and hack temporary image

* Update page registry to work with new endpoints
This commit is contained in:
Alan Rominger
2023-01-27 13:06:55 -05:00
committed by GitHub
parent 700055801a
commit 7598e117d4
4 changed files with 27 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
awx/main/models/inventory.py
View File

@@ -49,7 +49,7 @@ from awx.main.models.notifications import (
from awx.main.models.credential.injectors import _openstack_data
from awx.main.utils import _inventory_updates
from awx.main.utils.safe_yaml import sanitize_jinja
from awx.main.utils.execution_environments import to_container_path
from awx.main.utils.execution_environments import to_container_path, get_control_plane_execution_environment
from awx.main.utils.licensing import server_product_name
@@ -951,6 +951,16 @@ class InventorySourceOptions(BaseModel):
help_text=_("Enter host, group or pattern match"),
)
def resolve_execution_environment(self):
"""
Project updates, themselves, will use the control plane execution environment.
Jobs using the project can use the default_environment, but the project updates
are not flexible enough to allow customizing the image they use.
"""
if self.inventory.kind == 'constructed':
return get_control_plane_execution_environment()
return super().resolve_execution_environment()
@staticmethod
def cloud_credential_validation(source, cred):
if not source: