Merge lp:~usrleon/nova/small_fixes 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.

Unmerged revisions

1036. By Max Lvov on 2011-05-03

default flagfile search in: scriptdir->current dir->/etc/nova

1035. By Max Lvov on 2011-04-27

'nova-manage image delete <image id or name>' function implementation

1034. By Max Lvov on 2011-04-27

default_flagfile in /etc if doesn't exist in script dir

1033. By Max Lvov on 2011-04-25

Default path for paste to /etc/nova/api-paste.ini

1032. By Max Lvov on 2011-04-25

countryName=supplied otherwise 'match' causes error in some cases

1031. By Max Lvov on 2011-04-25

default_flagfile full path

=== modified file 'bin/nova-manage'
--- bin/nova-manage	2011-04-30 02:46:29 +0000
+++ bin/nova-manage	2011-05-03 11:17:50 +0000
@@ -1044,6 +1044,20 @@
         self._convert_images(other_images)
         self._convert_images(machine_images)
 
+    def delete(self, image_id_or_name):
+        """Removes image from image_service by id or name
+           arguments: image id or name"""
+        try:
+            image = self.image_service.show(context, image_id_or_name)
+        except exception.NotFound:
+            try:
+                image = self.image_service.show_by_name(context, image_id_or_name)
+            except exception.NotFound:
+                print "Can't find image '{}'".format(image_id_or_name)
+                return
+        self.image_service.delete(context, image['id'])
+        print "Image id='{0}' name='{1}' deleted successfully".format(image['id'], image['name'])
+
 
 CATEGORIES = [
     ('user', UserCommands),
 
=== 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-03 11:17:50 +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/service.py'
--- nova/service.py	2011-04-20 19:08:22 +0000
+++ nova/service.py	2011-05-03 11:17:50 +0000
@@ -52,7 +52,7 @@
 flags.DEFINE_string('osapi_listen', "0.0.0.0",
                     'IP address for OpenStack API to listen')
 flags.DEFINE_integer('osapi_listen_port', 8774, 'port for os api to listen')
-flags.DEFINE_string('api_paste_config', "api-paste.ini",
+flags.DEFINE_string('api_paste_config', "/etc/nova/api-paste.ini",
                     'File name for the paste.deploy config for nova-api')
 
 
 
=== modified file 'nova/utils.py'
--- nova/utils.py	2011-04-22 19:44:24 +0000
+++ nova/utils.py	2011-05-03 11:17:50 +0000
@@ -232,9 +232,13 @@
             # 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):