From d518891520a3e04d99b8f9b752c273ceb78d19ba Mon Sep 17 00:00:00 2001 From: Chris Meyers Date: Wed, 5 Aug 2020 12:06:37 -0400 Subject: [PATCH] inventory plugin inventory parameter take precedence over env vars --- awx/main/models/inventory.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/awx/main/models/inventory.py b/awx/main/models/inventory.py index 5121f081ed..6e3a22434c 100644 --- a/awx/main/models/inventory.py +++ b/awx/main/models/inventory.py @@ -1464,8 +1464,9 @@ class gce(PluginFileInjector): def inventory_as_dict(self, inventory_update, private_data_dir): ret = super().inventory_as_dict(inventory_update, private_data_dir) credential = inventory_update.get_cloud_credential() - # TODO: Align precedence of ENV vs. inventory config w/ Ansible behavior - ret['projects'] = [credential.get_input('project', default='')] + # InventorySource.source_vars take precedence over ENV vars + if 'projects' not in ret: + ret['projects'] = [credential.get_input('project', default='')] return ret