56b349dee7
Fixes bug 1105523 The patch set adds 2 new functions: 1. register_root_helper - this enables all wanting to use the root_helper variable. This is under the section AGENT. 2. get_root_helper - this is a helper function that returns the root_helper. This should be used when the application used to have the root_helper defined under the section DEFAULT. This ensures backward compatability. Change-Id: Iba72c4fc89ba5329ea045483287012f82b306250
65 lines
1.8 KiB
Python
65 lines
1.8 KiB
Python
# vim: tabstop=4 shiftwidth=4 softtabstop=4
|
|
|
|
# Copyright 2012 OpenStack LLC
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
|
|
from quantum.common import config
|
|
from quantum.openstack.common import cfg
|
|
from quantum.openstack.common import log as logging
|
|
|
|
|
|
LOG = logging.getLogger(__name__)
|
|
|
|
|
|
ROOT_HELPER_OPTS = [
|
|
cfg.StrOpt('root_helper', default='sudo',
|
|
help=_('Root helper application.')),
|
|
]
|
|
|
|
|
|
def register_root_helper(conf):
|
|
# The first call is to ensure backward compatibility
|
|
conf.register_opts(ROOT_HELPER_OPTS)
|
|
conf.register_opts(ROOT_HELPER_OPTS, 'AGENT')
|
|
|
|
|
|
def get_root_helper(conf):
|
|
root_helper = conf.AGENT.root_helper
|
|
if root_helper is not 'sudo':
|
|
return root_helper
|
|
|
|
root_helper = conf.root_helper
|
|
if root_helper is not 'sudo':
|
|
LOG.deprecated(_('DEFAULT.root_helper is deprecated!'))
|
|
return root_helper
|
|
|
|
return 'sudo'
|
|
|
|
|
|
def setup_conf():
|
|
bind_opts = [
|
|
cfg.StrOpt('state_path',
|
|
default='/var/lib/quantum',
|
|
help=_('Top-level directory for maintaining dhcp state')),
|
|
]
|
|
|
|
conf = cfg.ConfigOpts()
|
|
conf.register_opts(bind_opts)
|
|
return conf
|
|
|
|
# add a logging setup method here for convenience
|
|
setup_logging = config.setup_logging
|