Skip to content

Commit

Permalink
Keeping default profile optional for now. See discussion in #87.
Browse files Browse the repository at this point in the history
This reverts commit 1b370cb.
  • Loading branch information
obilodeau committed Oct 31, 2017
1 parent fba7154 commit e239eb0
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions malboxes/malboxes.py
Original file line number Diff line number Diff line change
Expand Up @@ -192,10 +192,11 @@ def prepare_config(template):

config = load_config(config_file, template)

profile_config = prepare_profile(template, config)
if "profile" in config.keys():
profile_config = prepare_profile(template, config)

# profile_config might contain a profile not in the config file
config.update(profile_config)
# profile_config might contain a profile not in the config file
config.update(profile_config)

packer_tmpl = prepare_packer_template(config, template)

Expand Down

0 comments on commit e239eb0

Please sign in to comment.