Merge lp:~usrleon/nova/small_fix into lp:~hudson-openstack/nova/trunk

[Max Lvov]

1 Set default paths for nova.conf and api-paste.ini to /etc/nova/
2 Changed countryName policy because https://bugs.launchpad.net/nova/+bug/724317 still affected.

[Jay Pipes (jaypipes)]

Hi!

I'm not sure that I agree with changing the default location of nova.conf from the current working directory to /etc/nova. Generally, I think these kind of things belong more to the realm of packaging or configuration management, and specifying a location other than the current working directory assumes a certain setup. Granted, /etc/nova is standard deployment for configuration files, but I still think we should leave that up to the configuration management tool and/or packaging scripts...

The LDAP change I will politely defer to Ryan Lane or someone other LDAP expert (not me!) :)

Thoughts?

[Vish Ishaya (vishvananda)]

I agree in general with Jay's point. You can always specify the file on the command line as well.

The LDAP change seems fine, since match seems to have that weird issue where 'California' != 'California' for some reason.

Vish

On Apr 26, 2011, at 7:36 AM, Jay Pipes wrote:

> Hi!
>
> I'm not sure that I agree with changing the default location of nova.conf from the current working directory to /etc/nova. Generally, I think these kind of things belong more to the realm of packaging or configuration management, and specifying a location other than the current working directory assumes a certain setup. Granted, /etc/nova is standard deployment for configuration files, but I still think we should leave that up to the configuration management tool and/or packaging scripts...
>
> The LDAP change I will politely defer to Ryan Lane or someone other LDAP expert (not me!) :)
>
> Thoughts?
> --
> https://code.launchpad.net/~usrleon/nova/small_fixes/+merge/58934
> You are subscribed to branch lp:nova.

[Max Lvov (usrleon)]

I just tired type "--flagfile /etc/nova/nova.conf" and often forgot it, then I supposed Im not alone :)
Bug with openssl in my case possible caused russian locale on my system, but Im not sure.

[Devin Carlen (devcamcar)]

I actually like the change to the default flagfile location. In 99% of installations it's going to be in /etc/nova, and it causes a fair amount of confusion in the community. I wouldn't mind seeing this change go in.

review: Approve

[Ilya Alekseyev (ilyaalekseyev)]

Gents,

we have hyper-v virt driver in nova, but /etc/nova/nova.conf seems not very fair for windows.
Policy relaxation seems good.

Just 2 cents.

[Max Lvov (usrleon)]

Ok, I suggest 1034 instead 1031, but I not understand why it looks nova.conf in script directory, not current, home, etc.

[Josh Kearney (jk0)]

Why not have it look in both the current directory and /etc/nova? If there is no nova.conf in ., default to /etc/nova.

review: Needs Information

[Max Lvov (usrleon)]

Superseded for clarify target changes, sorry my mistakes with launchpad workflow.

[Josh Kearney (jk0)]

Nice work.

review: Approve

[Paul Voccio (pvo)]

ok

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~usrleon/nova/small_fix into lp:nova failed. Below is the output from the failed tests.

AccountsTest
    test_account_create OK
    test_account_delete OK
    test_account_update OK
    test_get_account OK
AdminAPITest
    test_admin_disabled OK
    test_admin_enabled OK
APITest
    test_exceptions_are_converted_to_faults OK
Test
    test_authorize_token OK
    test_authorize_user OK
    test_bad_token OK
    test_bad_user_bad_key OK
    test_bad_user_good_key OK
    test_no_user OK
    test_token_expiry OK
TestFunctional
    test_token_doesnotexist OK
    test_token_expiry OK
TestLimiter
    test_authorize_token OK
LimiterTest
    test_limiter_custom_max_limit OK
    test_limiter_limit_and_offset OK
    test_limiter_limit_medium OK
    test_limiter_limit_over_max OK
    test_limiter_limit_zero OK
    test_limiter_negative_limit OK
    test_limiter_negative_offset OK
    test_limiter_nothing OK
    test_limiter_offset_bad OK
    test_limiter_offset_blank OK
    test_limiter_offset_medium OK
    test_limiter_offset_over_max OK
    test_limiter_offset_zero OK
ActionExtensionTest
    test_extended_action OK
    test_invalid_action OK
    test_invalid_action_body OK
ExtensionControllerTest
    test_get_by_alias OK
    test_index OK
ExtensionManagerTest
    test_get_resources OK
ResourceExtensionTest
    test_get_resources OK
    test_get_resources_with_controller OK
    test_no_extension_present OK
ResponseExtensionTest
    test_get_resources_with_mgr OK
    test_get_resources_with_stub_mgr OK
TestFaults
    test_400_fault_json OK
    test_400_fault_xml OK
    test...

[lp:~usrleon/nova/small_fix]

1053. By Max Lvov on 2011-05-11

changing Authors file

[Rick Harris (rconradharris)]

lgtm

review: Approve

=== modified file 'Authors'
--- Authors	2011-05-10 03:36:01 +0000
+++ Authors	2011-05-11 07:48:43 +0000
@@ -51,6 +51,7 @@
 Kevin L. Mitchell <[e-mail]>
 Koji Iida <[e-mail]>
 Lorin Hochstein <[e-mail]>
+Lvov Maxim <[e-mail]>
 Mark Washenberger <[e-mail]>
 Masanori Itoh <[e-mail]>
 Matt Dietz <[e-mail]>

=== modified file 'nova/CA/openssl.cnf.tmpl'
--- nova/CA/openssl.cnf.tmpl	2011-04-08 16:22:09 +0000
+++ nova/CA/openssl.cnf.tmpl	2011-05-11 07:48:43 +0000
@@ -46,7 +46,7 @@
 # RHEL 6 and Fedora 14 (using openssl-1.0.0-4.el6.x86_64 or
 # openssl-1.0.0d-1.fc14.x86_64)
 [ policy_match ]
-countryName		= match
+countryName		= supplied
 stateOrProvinceName	= supplied
 organizationName	= optional
 organizationalUnitName	= optional

=== modified file 'nova/utils.py'
--- nova/utils.py	2011-04-29 13:25:28 +0000
+++ nova/utils.py	2011-05-11 07:48:43 +0000
@@ -232,9 +232,12 @@
             # turn relative filename into an absolute path
             script_dir = os.path.dirname(inspect.stack()[-1][1])
             filename = os.path.abspath(os.path.join(script_dir, filename))
-        if os.path.exists(filename):
-            flagfile = ['--flagfile=%s' % filename]
-            sys.argv = sys.argv[:1] + flagfile + sys.argv[1:]
+        if not os.path.exists(filename):
+            filename = "./nova.conf"
+            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):