Delete last bits of bin/. With the move to entrypoints these aren't needed anymore. Update CONF.bindir to default to os.path.join(sys.prefix, 'local', 'bin') Part of blueprint entrypoints-plugins Change-Id: I95250d3779433e7b85aaa889a873b16c86a7d2be
		
			
				
	
	
		
			70 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			70 lines
		
	
	
		
			2.2 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
# vim: tabstop=4 shiftwidth=4 softtabstop=4
 | 
						|
 | 
						|
# Copyright 2010 United States Government as represented by the
 | 
						|
# Administrator of the National Aeronautics and Space Administration.
 | 
						|
# All Rights Reserved.
 | 
						|
# Copyright 2012 Red Hat, Inc.
 | 
						|
#
 | 
						|
#    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.
 | 
						|
 | 
						|
import os
 | 
						|
import sys
 | 
						|
 | 
						|
from oslo.config import cfg
 | 
						|
 | 
						|
path_opts = [
 | 
						|
    cfg.StrOpt('pybasedir',
 | 
						|
               default=os.path.abspath(os.path.join(os.path.dirname(__file__),
 | 
						|
                                                    '../')),
 | 
						|
               help='Directory where the nova python module is installed'),
 | 
						|
    cfg.StrOpt('bindir',
 | 
						|
               default=os.path.join(sys.prefix, 'local', 'bin'),
 | 
						|
               help='Directory where nova binaries are installed'),
 | 
						|
    cfg.StrOpt('state_path',
 | 
						|
               default='$pybasedir',
 | 
						|
               help="Top-level directory for maintaining nova's state"),
 | 
						|
]
 | 
						|
 | 
						|
CONF = cfg.CONF
 | 
						|
CONF.register_opts(path_opts)
 | 
						|
 | 
						|
 | 
						|
def basedir_def(*args):
 | 
						|
    """Return an uninterpolated path relative to $pybasedir."""
 | 
						|
    return os.path.join('$pybasedir', *args)
 | 
						|
 | 
						|
 | 
						|
def bindir_def(*args):
 | 
						|
    """Return an uninterpolated path relative to $bindir."""
 | 
						|
    return os.path.join('$bindir', *args)
 | 
						|
 | 
						|
 | 
						|
def state_path_def(*args):
 | 
						|
    """Return an uninterpolated path relative to $state_path."""
 | 
						|
    return os.path.join('$state_path', *args)
 | 
						|
 | 
						|
 | 
						|
def basedir_rel(*args):
 | 
						|
    """Return a path relative to $pybasedir."""
 | 
						|
    return os.path.join(CONF.pybasedir, *args)
 | 
						|
 | 
						|
 | 
						|
def bindir_rel(*args):
 | 
						|
    """Return a path relative to $bindir."""
 | 
						|
    return os.path.join(CONF.bindir, *args)
 | 
						|
 | 
						|
 | 
						|
def state_path_rel(*args):
 | 
						|
    """Return a path relative to $state_path."""
 | 
						|
    return os.path.join(CONF.state_path, *args)
 |