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

Merge pull request #741 from rbywater/bugfix/cloudformsinventory

Browse Source 
Fix CloudForms enabled & id variable names - relates to #705
This commit is contained in:
Matthew Jones
2018-01-10 00:22:58 -05:00
committed by GitHub
parent 54d3412820 079abc162f
commit 6504972d82
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
awx/settings/defaults.py
View File

@@ -855,12 +855,12 @@ SATELLITE6_GROUP_PATTERNS = ["{app}-{tier}-{color}", "{app}-{color}", "{app}", "
# --------------------- # ---------------------
# ----- CloudForms ----- # ----- CloudForms -----
# --------------------- # ---------------------
CLOUDFORMS_ENABLED_VAR = 'power_state' CLOUDFORMS_ENABLED_VAR = 'cloudforms.power_state'
CLOUDFORMS_ENABLED_VALUE = 'on' CLOUDFORMS_ENABLED_VALUE = 'on'
CLOUDFORMS_GROUP_FILTER = r'^.+$' CLOUDFORMS_GROUP_FILTER = r'^.+$'
CLOUDFORMS_HOST_FILTER = r'^.+$' CLOUDFORMS_HOST_FILTER = r'^.+$'
CLOUDFORMS_EXCLUDE_EMPTY_GROUPS = True CLOUDFORMS_EXCLUDE_EMPTY_GROUPS = True
CLOUDFORMS_INSTANCE_ID_VAR = 'id' CLOUDFORMS_INSTANCE_ID_VAR = 'cloudforms.id'
# --------------------- # ---------------------
# ----- Custom ----- # ----- Custom -----