openstack/neutron-vpnaas
Code Issues Proposed changes

dom0 rootwrap - case insensitive xenapi section

Browse Source 
As per change https://review.openstack.org/33429 the config sections
became lowercase. This patch makes the quantum-rootwrap-xen-dom0
rootwrap to be case insensitive for the xenapi section.

This patch also changes the default config file to use a lowercase
xenapi section.

Fixes bug 1195781

Change-Id: Ic24feb1a9ad6f8823745b1febd4a0edd54e73498
This commit is contained in:
Mate Lakat 2013-06-28 16:22:04 +01:00
parent f61c2477bf
commit 8d0f8e1b99
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
bin/quantum-rootwrap-xen-dom0
View File

@ -51,13 +51,22 @@ def parse_args():
return exec_name, config_file, user_args return exec_name, config_file, user_args
def _xenapi_section_name(config):
sections = [sect for sect in config.sections() if sect.lower() == "xenapi"]
if len(sections) == 1:
return sections[0]
print "Multiple [xenapi] sections or no [xenapi] section found!"
sys.exit(RC_BADCONFIG)
def load_configuration(exec_name, config_file): def load_configuration(exec_name, config_file):
config = ConfigParser.RawConfigParser() config = ConfigParser.RawConfigParser()
config.read(config_file) config.read(config_file)
try: try:
exec_dirs = config.get("DEFAULT", "exec_dirs").split(",") exec_dirs = config.get("DEFAULT", "exec_dirs").split(",")
filters_path = config.get("DEFAULT", "filters_path").split(",") filters_path = config.get("DEFAULT", "filters_path").split(",")
section = 'XENAPI' section = _xenapi_section_name(config)
url = config.get(section, "xenapi_connection_url") url = config.get(section, "xenapi_connection_url")
username = config.get(section, "xenapi_connection_username") username = config.get(section, "xenapi_connection_username")
password = config.get(section, "xenapi_connection_password") password = config.get(section, "xenapi_connection_password")

2
etc/rootwrap.conf
View File

@ -9,7 +9,7 @@ filters_path=/etc/quantum/rootwrap.d,/usr/share/quantum/rootwrap
# These directories MUST all be only writeable by root ! # These directories MUST all be only writeable by root !
exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin exec_dirs=/sbin,/usr/sbin,/bin,/usr/bin
[XENAPI] [xenapi]
# XenAPI configuration is only required by the L2 agent if it is to # XenAPI configuration is only required by the L2 agent if it is to
# target a XenServer/XCP compute host's dom0. # target a XenServer/XCP compute host's dom0.
xenapi_connection_url=<None> xenapi_connection_url=<None>