Parse json strings
This is follow-up of 8a58fd0914 and
ensures the json string values passed are parsed when actually used to
set parameters.
Change-Id: I2e67ab0e72fafa6239a661e2a1529f7d694794b9
			
			
This commit is contained in:
		@@ -167,7 +167,7 @@ def initConfig(controller):
 | 
			
		||||
                        "'name':'default'}, {...}] "),
 | 
			
		||||
             "OPTION_LIST": [],
 | 
			
		||||
             "VALIDATORS": [],
 | 
			
		||||
             "DEFAULT_VALUE": "",
 | 
			
		||||
             "DEFAULT_VALUE": "[]",
 | 
			
		||||
             "MASK_INPUT": False,
 | 
			
		||||
             "LOOSE_VALIDATION": True,
 | 
			
		||||
             "CONF_NAME": "CONFIG_NOVA_PCI_ALIAS",
 | 
			
		||||
@@ -182,7 +182,7 @@ def initConfig(controller):
 | 
			
		||||
                        "'name':'default'}, {...}]"),
 | 
			
		||||
             "OPTION_LIST": [],
 | 
			
		||||
             "VALIDATORS": [],
 | 
			
		||||
             "DEFAULT_VALUE": "",
 | 
			
		||||
             "DEFAULT_VALUE": "[]",
 | 
			
		||||
             "MASK_INPUT": False,
 | 
			
		||||
             "LOOSE_VALIDATION": True,
 | 
			
		||||
             "CONF_NAME": "CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST",
 | 
			
		||||
@@ -438,12 +438,6 @@ def create_common_manifest(config, messages):
 | 
			
		||||
    dbacces_hosts = set([config.get('CONFIG_CONTROLLER_HOST')])
 | 
			
		||||
    dbacces_hosts |= network_hosts
 | 
			
		||||
 | 
			
		||||
    if config['CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'] == '':
 | 
			
		||||
        config['CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'] = []
 | 
			
		||||
 | 
			
		||||
    if config['CONFIG_NOVA_PCI_ALIAS'] == '':
 | 
			
		||||
        config['CONFIG_NOVA_PCI_ALIAS'] = []
 | 
			
		||||
 | 
			
		||||
    for host in filtered_hosts(config):
 | 
			
		||||
        pw_in_sqlconn = False
 | 
			
		||||
        host = host.strip()
 | 
			
		||||
 
 | 
			
		||||
@@ -16,11 +16,7 @@ class packstack::nova::api ()
 | 
			
		||||
      auth_url             => lookup('CONFIG_KEYSTONE_ADMIN_URL'),
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    if lookup('CONFIG_NOVA_PCI_ALIAS') == '' {
 | 
			
		||||
      $pci_alias = []
 | 
			
		||||
    } else {
 | 
			
		||||
      $pci_alias = lookup('CONFIG_NOVA_PCI_ALIAS')
 | 
			
		||||
    }
 | 
			
		||||
    $pci_alias = parsejson(lookup('CONFIG_NOVA_PCI_ALIAS'))
 | 
			
		||||
 | 
			
		||||
    class { 'nova::pci':
 | 
			
		||||
      aliases => $pci_alias,
 | 
			
		||||
 
 | 
			
		||||
@@ -69,7 +69,7 @@ class packstack::nova::compute ()
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    class { 'nova::compute::pci':
 | 
			
		||||
      passthrough => lookup('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST')
 | 
			
		||||
      passthrough => parsejson(lookup('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'))
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    class { 'nova::compute':
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user