openstack/nova
Code Issues Proposed changes

1 Set default paths for nova.conf and api-paste.ini to /etc/nova/

Browse Source 
2 Changed countryName policy because https://bugs.launchpad.net/nova/+bug/724317 still affected.
This commit is contained in:
Lvov Maxim
2011-05-11 22:56:57 +00:00
committed by Tarmac
parent 1d7b698fee ffabb107d8
commit 0576766cdf
3 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@@ -51,6 +51,7 @@ Kevin Bringard <kbringard@attinteractive.com>
Kevin L. Mitchell <kevin.mitchell@rackspace.com> Kevin L. Mitchell <kevin.mitchell@rackspace.com>
Koji Iida <iida.koji@lab.ntt.co.jp> Koji Iida <iida.koji@lab.ntt.co.jp>
Lorin Hochstein <lorin@isi.edu> Lorin Hochstein <lorin@isi.edu>
Lvov Maxim <usrleon@gmail.com>
Mark Washenberger <mark.washenberger@rackspace.com> Mark Washenberger <mark.washenberger@rackspace.com>
Masanori Itoh <itoumsn@nttdata.co.jp> Masanori Itoh <itoumsn@nttdata.co.jp>
Matt Dietz <matt.dietz@rackspace.com> Matt Dietz <matt.dietz@rackspace.com>

2
nova/CA/openssl.cnf.tmpl
View File

@@ -46,7 +46,7 @@ policy = policy_match
# RHEL 6 and Fedora 14 (using openssl-1.0.0-4.el6.x86_64 or # RHEL 6 and Fedora 14 (using openssl-1.0.0-4.el6.x86_64 or
# openssl-1.0.0d-1.fc14.x86_64) # openssl-1.0.0d-1.fc14.x86_64)
[ policy_match ] [ policy_match ]
countryName = match countryName = supplied
stateOrProvinceName = supplied stateOrProvinceName = supplied
organizationName = optional organizationName = optional
organizationalUnitName = optional organizationalUnitName = optional

9
nova/utils.py
View File

@@ -232,9 +232,12 @@ def default_flagfile(filename='nova.conf'):
# turn relative filename into an absolute path # turn relative filename into an absolute path
script_dir = os.path.dirname(inspect.stack()[-1][1]) script_dir = os.path.dirname(inspect.stack()[-1][1])
filename = os.path.abspath(os.path.join(script_dir, filename)) filename = os.path.abspath(os.path.join(script_dir, filename))
if os.path.exists(filename): if not os.path.exists(filename):
flagfile = ['--flagfile=%s' % filename] filename = "./nova.conf"
sys.argv = sys.argv[:1] + flagfile + sys.argv[1:] if not os.path.exists(filename):
filename = '/etc/nova/nova.conf'
flagfile = ['--flagfile=%s' % filename]
sys.argv = sys.argv[:1] + flagfile + sys.argv[1:]
def debug(arg): def debug(arg):