From 079abc162fe0e7f69d326742f45f20b869a5a89e Mon Sep 17 00:00:00 2001 From: Richard Bywater Date: Thu, 30 Nov 2017 09:30:23 +1300 Subject: [PATCH] Fix CloudForms enabled & id variable names 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. --- awx/settings/defaults.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/settings/defaults.py b/awx/settings/defaults.py index f52aa36832..1c21a5dcf8 100644 --- a/awx/settings/defaults.py +++ b/awx/settings/defaults.py @@ -834,12 +834,12 @@ SATELLITE6_GROUP_PATTERNS = ["{app}-{tier}-{color}", "{app}-{color}", "{app}", " # --------------------- # ----- CloudForms ----- # --------------------- -CLOUDFORMS_ENABLED_VAR = 'power_state' +CLOUDFORMS_ENABLED_VAR = 'cloudforms.power_state' CLOUDFORMS_ENABLED_VALUE = 'on' CLOUDFORMS_GROUP_FILTER = r'^.+$' CLOUDFORMS_HOST_FILTER = r'^.+$' CLOUDFORMS_EXCLUDE_EMPTY_GROUPS = True -CLOUDFORMS_INSTANCE_ID_VAR = 'id' +CLOUDFORMS_INSTANCE_ID_VAR = 'cloudforms.id' # --------------------- # ----- Custom -----