Skip to content

Commit

Permalink
AnsibleVarsGenerator.py: fixing regression issue introducted during u…
Browse files Browse the repository at this point in the history
…pgrade refactor
  • Loading branch information
sk4zuzu committed Jul 22, 2020
1 parent 5d1e763 commit c38eb9d
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion core/src/epicli/cli/engine/ansible/AnsibleVarsGenerator.py
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,11 @@ def populate_group_vars(self, ansible_dir):
main_vars['is_upgrade_run'] = self.is_upgrade_run
main_vars['roles_with_generated_vars'] = sorted(self.roles_with_generated_vars)

shared_config_doc = self.inventory_upgrade.shared_config
if self.is_upgrade_run:
shared_config_doc = self.inventory_upgrade.shared_config
else:
shared_config_doc = select_first(self.config_docs, lambda x: x.kind == 'configuration/shared-config')

if shared_config_doc == None:
shared_config_doc = load_yaml_obj(types.DEFAULT, 'common', 'configuration/shared-config')

Expand Down

0 comments on commit c38eb9d

Please sign in to comment.