Remove straggling references to upstart

Upstart was legacy of Ubuntu 14.04, which we don't support.

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

diff --git a/files/upstart.odl.conf b/files/upstart.odl.conf
deleted file mode 100644 (file)
index 90569b2..0000000
--- a/files/upstart.odl.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-# odl - OpenDaylight SDN Controller
-#
-# NB: The ODL Upstart config provided by ODL Puppet mod isn't well supported
-
-description     "OpenDaylight SDN Controller"
-
-# Make sure we start before an interface receives traffic
-start on (started network-interface
-          or started network-manager
-          or started networking)
-
-stop on runlevel [!023456]
-
-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 -- server
-

diff --git a/manifests/service.pp b/manifests/service.pp
index d0ac5ee3ba1d964bdf92165c8210dc5b66e544a4..7f8786e54368479ef8db25a36e4878ce10a2c9b1 100644 (file)
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -1,6 +1,6 @@
 # == Class opendaylight::service
 #
-# Starts the OpenDaylight systemd or Upstart service.
+# Starts the OpenDaylight systemd service.
 #
 class opendaylight::service {
   service { 'opendaylight':

diff --git a/spec/classes/opendaylight_spec.rb b/spec/classes/opendaylight_spec.rb
index 5f77050dbdd99a67ff825fc2bf929ca3096dceea..deddde8158eb18ce678b122bf532df141c2d5160 100644 (file)
--- a/spec/classes/opendaylight_spec.rb
+++ b/spec/classes/opendaylight_spec.rb
@@ -152,9 +152,8 @@ describe 'opendaylight' do
             generic_tests
 
             # Run test that specialize in checking deb-based installs
-            # NB: Passing osfamily required to do upstart vs systemd (default) checks
             # Note that this function is defined in spec_helper
-            deb_install_tests(osfamily: osfamily)
+            deb_install_tests
 
             # Run test that specialize in checking Karaf feature installs
             # NB: Only testing defaults here, specialized Karaf tests elsewhere