Merge lp:~zulcss/keystone/keystone-upstart into lp:~openstack-ubuntu-testing/keystone/grizzly

[Chuck Short]

[Adam Gandelman (gandelman-a)]

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-03-11 23:12:25 +0000
+++ debian/changelog	2013-03-18 20:24:41 +0000
@@ -17,6 +17,8 @@
    * debian/control:Clean-up depends:
     - Dropped python-prettytable no longer needed.
    * Update standards 
+   * debian/keystone.upstart: Start on runlevel [2345]
+     (LP: #1153988)
 
   [ Adam Gandelman ]
   * debian/keystone.postinst: Run pki_setup during configure to intitialize
 
=== modified file 'debian/keystone.upstart'
--- debian/keystone.upstart	2012-11-25 23:10:56 +0000
+++ debian/keystone.upstart	2013-03-18 20:24:41 +0000
@@ -1,7 +1,7 @@
 description "Keystone API server"
 author "Soren Hansen <[e-mail]>"
 
-start on (local-filesystems and net-device-up IFACE!=lo)
+start on runlevel [2345]
 stop on runlevel [!2345]
 
 respawn