External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-07 11:41:08 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix CloudForms enabled & id variable names

Browse Source 
On Cloudforms (Version 2.0 at least), the dictionary that gets passed to
the inventory_import has a top-level 'cloudforms' dictionary element
that contains the 'id' and 'power_state' rather than those elements
being at the top-level of the dictionary.

This change adds in the 'cloudforms' into the expected name.
This commit is contained in:
Richard Bywater
2017-11-30 09:30:23 +13:00
parent 1899795d08
commit 079abc162f
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

@@ -834,12 +834,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 -----