Merge lp:~zulcss/nova/nova-config into lp:~openstack-ubuntu-testing/nova/grizzly

[Chuck Short]

[Yolanda Robla (yolanda.robla)]

Looks good to me

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-31 15:21:09 +0000
+++ debian/changelog	2013-02-07 15:29:25 +0000
@@ -14,6 +14,10 @@
   [ Adam Gandelman ]
   * debian/control: Fix typo (websocikfy -> websockify).
 
+  [ Chuck Short ]
+  * debian/nova-common.postinst: Removed config file conversion, since
+    the option is no longer available. (LP: #1110567)
+
  -- Adam Gandelman <[e-mail]>  Wed, 23 Jan 2013 14:23:22 -0800
 
 nova (2013.1~g2-0ubuntu3) raring; urgency=low
 
=== modified file 'debian/nova-common.postinst'
--- debian/nova-common.postinst	2012-09-24 14:45:25 +0000
+++ debian/nova-common.postinst	2013-02-07 15:29:25 +0000
@@ -24,18 +24,6 @@
       find /var/lib/nova/ -name 'rootfs' -prune -o \
         -group nogroup -a -user nova -exec chown nova:nova {} \;
     elif dpkg --compare-versions "$2" lt "2012.2~f1~20120503.13935-0ubuntu1"; then
-      # convert the /etc/nova/nova.conf to the new configuration
-      mv /etc/nova/nova.conf /etc/nova/nova.conf.upgrade
-      nova-manage config convert --infile=/etc/nova/nova.conf.upgrade \
-        --outfile=/etc/nova/nova.conf
-      chmod 600 /etc/nova/nova.conf
-      chown nova:nova /etc/nova/nova.conf
-      # nova.conf, too (if its there)
-      if [ -e /etc/nova/nova-compute.conf ] ; then
-        mv /etc/nova/nova-compute.conf /etc/nova/nova-compute.conf.upgrade
-        nova-manage config convert --infile=/etc/nova/nova-compute.conf.upgrade \
-          --outfile=/etc/nova/nova-compute.conf  
-      fi
 	  # convert the root_helper to rootwrap_config
 	  sed -e "s,^root_helper=.\+,rootwrap_config=/etc/nova/rootwrap.conf," -i /etc/nova/nova.conf
     fi