Delay ODL startup and disable console

Delay ODL startup until networking service is up, otherwise if all
interfaces on the box come up with DHCP and there is no local
definition of FQDN (as in `/etc/hosts`), ODL fails to startup.

Secondly disable the server console when starting up, otherwise it will
hijack the startup tty.

Change-Id: I2e973d4207f95e1ef823c269aaa82b3b1fe5b71d
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/files/upstart.odl.conf b/files/upstart.odl.conf
index e1746e4829c07a08f5af67569281f949d7ab3825..90569b288a365c6b5900dfa51a719102b45871c4 100644 (file)
--- a/files/upstart.odl.conf
+++ b/files/upstart.odl.conf
@@ -5,9 +5,9 @@
 description     "OpenDaylight SDN Controller"
 
 # Make sure we start before an interface receives traffic
-start on (starting network-interface
-          or starting network-manager
-          or starting networking)
+start on (started network-interface
+          or started network-manager
+          or started networking)
 
 stop on runlevel [!023456]
 
@@ -15,5 +15,5 @@ console output
 
 export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-amd64/
 
-exec start-stop-daemon --start --chuid odl:odl -u odl -n java --startas /opt/opendaylight/bin/karaf --
+exec start-stop-daemon --start --chuid odl:odl -u odl -n java --startas /opt/opendaylight/bin/karaf -- server