x/packstack
Code Issues Proposed changes

Merge "Parse json strings"

Browse Source
This commit is contained in:
Zuul
2025-04-01 12:19:22 +00:00
committed by Gerrit Code Review
parent 90c267eed9 583fdfa2a9
commit d1dedfcf3d
3 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packstack/plugins/nova_300.py
View File

@@ -167,7 +167,7 @@ def initConfig(controller):
"'name':'default'}, {...}] "), "'name':'default'}, {...}] "),
"OPTION_LIST": [], "OPTION_LIST": [],
"VALIDATORS": [], "VALIDATORS": [],
"DEFAULT_VALUE": "", "DEFAULT_VALUE": "[]",
"MASK_INPUT": False, "MASK_INPUT": False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME": "CONFIG_NOVA_PCI_ALIAS", "CONF_NAME": "CONFIG_NOVA_PCI_ALIAS",
@@ -182,7 +182,7 @@ def initConfig(controller):
"'name':'default'}, {...}]"), "'name':'default'}, {...}]"),
"OPTION_LIST": [], "OPTION_LIST": [],
"VALIDATORS": [], "VALIDATORS": [],
"DEFAULT_VALUE": "", "DEFAULT_VALUE": "[]",
"MASK_INPUT": False, "MASK_INPUT": False,
"LOOSE_VALIDATION": True, "LOOSE_VALIDATION": True,
"CONF_NAME": "CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST", "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 = set([config.get('CONFIG_CONTROLLER_HOST')])
dbacces_hosts |= network_hosts 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): for host in filtered_hosts(config):
pw_in_sqlconn = False pw_in_sqlconn = False
host = host.strip() host = host.strip()

6
packstack/puppet/modules/packstack/manifests/nova/api.pp
View File

@@ -16,11 +16,7 @@ class packstack::nova::api ()
auth_url => lookup('CONFIG_KEYSTONE_ADMIN_URL'), auth_url => lookup('CONFIG_KEYSTONE_ADMIN_URL'),
} }
if lookup('CONFIG_NOVA_PCI_ALIAS') == '' { $pci_alias = parsejson(lookup('CONFIG_NOVA_PCI_ALIAS'))
$pci_alias = []
} else {
$pci_alias = lookup('CONFIG_NOVA_PCI_ALIAS')
}
class { 'nova::pci': class { 'nova::pci':
aliases => $pci_alias, aliases => $pci_alias,

2
packstack/puppet/modules/packstack/manifests/nova/compute.pp
View File

@@ -69,7 +69,7 @@ class packstack::nova::compute ()
} }
class { 'nova::compute::pci': class { 'nova::compute::pci':
passthrough => lookup('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST') passthrough => parsejson(lookup('CONFIG_NOVA_PCI_PASSTHROUGH_WHITELIST'))
} }
class { 'nova::compute': class { 'nova::compute':