sysvinit: make cloud-init-local run before networking is brought up

While booting a VM from a snapshot image, network service use to find the
residual network config scripts and use to configure the old IPs.
cloud-init-local use to run later and populate the config scripts with latest
information, which does not override the previous configuration.

To solve this, we are ensuring that cloud-init-local runs before network.

LP: #1275098

3 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index bab40552..6f843933 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,6 +35,8 @@
  - Add functionality to fixate the uid of a newly added user.
  - Don't overwrite the hostname if the user has changed it after we set it.
  - GCE datasource does not handle instance ssh keys (LP: 1403617)
+ - sysvinit: make cloud-init-local run before network (LP: #1275098)
+   [Surojit Pathak]
 0.7.6:
  - open 0.7.6
  - Enable vendordata on CloudSigma datasource (LP: #1303986)
diff --git a/packages/brpm b/packages/brpm
index 72bfca08..c6d79e75 100755
--- a/packages/brpm
+++ b/packages/brpm
@@ -40,7 +40,7 @@ PKG_MP = {
         'jinja2': 'python-jinja2',
         'configobj': 'python-configobj',
         'jsonpatch': 'python-jsonpatch',
-        'oauth': 'python-oauth',
+        'oauthlib': 'python-oauth',
         'prettytable': 'python-prettytable',
         'pyserial': 'pyserial',
         'pyyaml': 'PyYAML',
diff --git a/sysvinit/redhat/cloud-init-local b/sysvinit/redhat/cloud-init-local
index b53e0db2..b9caedbd 100755
--- a/sysvinit/redhat/cloud-init-local
+++ b/sysvinit/redhat/cloud-init-local
@@ -23,9 +23,12 @@
 # See: http://www.novell.com/coolsolutions/feature/15380.html
 # Also based on dhcpd in RHEL (for comparison)
 
+# Bring this up before network, S10
+#chkconfig: 2345 09 91
+
 ### BEGIN INIT INFO
 # Provides:          cloud-init-local
-# Required-Start:    $local_fs $remote_fs
+# Required-Start:    $local_fs
 # Should-Start:      $time
 # Required-Stop:
 # Should-Stop: