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

bump foreman and expose new grouping features

Browse Source 
related to #3467
related to #5226
related to #4373
This commit is contained in:
Chris Meyers
2016-12-19 11:26:43 -05:00
parent 4f9d2fbde3
commit 1c4e6c55f5
4 changed files with 105 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/settings/defaults.py
View File

@@ -777,6 +777,8 @@ SATELLITE6_GROUP_FILTER = r'^.+$'
SATELLITE6_HOST_FILTER = r'^.+$'
SATELLITE6_EXCLUDE_EMPTY_GROUPS = True
SATELLITE6_INSTANCE_ID_VAR = 'foreman.id'
SATELLITE6_GROUP_PREFIX = 'foreman_'
SATELLITE6_GROUP_PATTERNS = ["{app}-{tier}-{color}", "{app}-{color}", "{app}", "{tier}"]
# ---------------------
# ----- CloudForms -----