Fix linting config/warnings for new linter version

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

diff --git a/Rakefile b/Rakefile
index 3350bb59a09d63bcfdebc151434ec9044b4d6c08..0a8129290b709527976e22cf239b4e8f754a2dd9 100644 (file)
--- a/Rakefile
+++ b/Rakefile
@@ -17,7 +17,7 @@ end
 
 PuppetLint.configuration.relative = true
 PuppetLint.configuration.send("disable_80chars")
-PuppetLint.configuration.log_format = "%{path}:%{linenumber}:%{check}:%{KIND}:%{message}"
+PuppetLint.configuration.log_format = "%{path}:%{line}:%{check}:%{KIND}:%{message}"
 PuppetLint.configuration.fail_on_warnings = true
 
 # Forsake support for Puppet 2.6.2 for the benefit of cleaner code.

diff --git a/manifests/config.pp b/manifests/config.pp
index e8706845f1d2eb2cb56a324ef949e1d451a86b2e..921965d645571db4f1b91b8cd2c30497920c84aa 100644 (file)
--- a/manifests/config.pp
+++ b/manifests/config.pp
@@ -84,8 +84,7 @@ class opendaylight::config {
       owner  => 'odl',
       group  => 'odl',
     }
-    ->
-    file { 'netvirt-aclservice-config.xml':
+    -> file { 'netvirt-aclservice-config.xml':
       ensure  => file,
       path    => '/opt/opendaylight/etc/opendaylight/datastore/initial/config/netvirt-aclservice-config.xml',
       owner   => 'odl',

diff --git a/manifests/init.pp b/manifests/init.pp
index 187e7aedd5aa35ad9ec659b3d8408bfcbfbb076f..bd26f1982033b2b691c463c99f6671c1b3f80e8e 100644 (file)
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -99,8 +99,8 @@ class opendaylight (
   # Build full list of features to install
   $features = union($default_features, $extra_features)
 
-  class { '::opendaylight::install': } ->
-  class { '::opendaylight::config': } ~>
-  class { '::opendaylight::service': } ->
-  Class['::opendaylight']
+  class { '::opendaylight::install': }
+  -> class { '::opendaylight::config': }
+  ~> class { '::opendaylight::service': }
+  -> Class['::opendaylight']
 }

diff --git a/manifests/install.pp b/manifests/install.pp
index 27ec205aab33c65ea288d536b8134b7f2f3bc02c..6f59c1f219b2fee5c3123b71354d11bc30216e4f 100644 (file)
--- a/manifests/install.pp
+++ b/manifests/install.pp
@@ -25,8 +25,7 @@ class opendaylight::install {
       after   => 'ExecStart=/opt/opendaylight/bin/start',
       require => Package['opendaylight'],
     }
-    ~>
-    exec {'reload_systemd_units':
+    ~> exec {'reload_systemd_units':
       command     => 'systemctl daemon-reload',
       path        => '/bin',
       refreshonly => true,