Fix wrong CONFIG_PROVSION_TEMPEST test

- Marshall_conf_bool() is just converting ['y'|'n'] into ['true'|'false'] which
  are Puppet Boolean value !
- Need to check the Python Boolean Value instead !

Change-Id: I4d9df5c7643f19aefd2fe2c6e95a2f086c756bd0
This commit is contained in:
Gael Chamoulaud
2014-06-25 11:06:45 +02:00
parent 82ec8b6f4a
commit 2652201413

View File

@@ -214,9 +214,6 @@ def initSequences(controller):
config['CONFIG_PROVISION_TEMPEST'] != "y"):
return
marshall_conf_bool(config, 'CONFIG_PROVISION_TEMPEST')
marshall_conf_bool(config, 'CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE')
provision_steps = []
if config['CONFIG_PROVISION_DEMO'] == "y":
@@ -225,12 +222,15 @@ def initSequences(controller):
'functions': [create_demo_manifest]}
)
if config['CONFIG_PROVISION_TEMPEST']:
if config['CONFIG_PROVISION_TEMPEST'] == "y":
provision_steps.append(
{'title': 'Adding Provisioning Tempest manifest entries',
'functions': [create_tempest_manifest]}
)
marshall_conf_bool(config, 'CONFIG_PROVISION_TEMPEST')
marshall_conf_bool(config, 'CONFIG_PROVISION_ALL_IN_ONE_OVS_BRIDGE')
controller.addSequence("Provisioning for Demo and Testing Usage",
[], [], provision_steps)