diff options
Diffstat (limited to 'deploy/deploy-config.py')
| -rw-r--r-- | deploy/deploy-config.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/deploy/deploy-config.py b/deploy/deploy-config.py index d9e774141..a0a44c1ed 100644 --- a/deploy/deploy-config.py +++ b/deploy/deploy-config.py @@ -264,7 +264,11 @@ dha_pod_conf.pop('dha-pod-config-metadata') final_dha_conf = dha_pod_conf dha_scenario_override_conf = deploy_scenario_conf["dha-override-config"] -if dha_scenario_override_conf: +# Only virtual deploy scenarios can override dha.yaml since there +# is no way to programatically override a physical environment: +# wireing, IPMI set-up, etc. +# For Physical environments, dha.yaml overrides will be silently ignored +if dha_scenario_override_conf and (final_dha_conf['adapter'] == 'libvirt' or final_dha_conf['adapter'] == 'esxi' or final_dha_conf['adapter'] == 'vbox'): print 'Merging dha-pod and deployment-scenario override information to final dha.yaml configuration....' final_dha_conf = dict(mergedicts(final_dha_conf, dha_scenario_override_conf)) |