From 736587a8781f5b286548cdfbf4a399423f1a1e71 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Sat, 25 Apr 2015 13:39:14 -0400
Subject: [PATCH] Fix errors in puppet-syntax-future

puppet-syntax-future job is failing because of a syntax error in the
manifests.
This patch aims to fix it.

Change-Id: Ib471e862bb7a9f735c5c6f045f4c627723dd6c3a
(cherry picked from commit 5e07f511b4dbe979745751ac30b4347209467d2d)
---
 manifests/database/sql/mysql.pp            | 2 +-
 manifests/network.pp                       | 2 +-
 manifests/network/controller.pp            | 2 +-
 manifests/network/vswitch.pp               | 2 +-
 spec/classes/cloud_network_vswitch_spec.rb | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/manifests/database/sql/mysql.pp b/manifests/database/sql/mysql.pp
index 7ec08364..0c1d67e6 100644
--- a/manifests/database/sql/mysql.pp
+++ b/manifests/database/sql/mysql.pp
@@ -417,7 +417,7 @@ class cloud::database::sql::mysql (
       }
     } # Debian
     default: {
-      err "${::osfamily} not supported yet"
+      fail("${::osfamily} not supported yet")
     }
   }
 
diff --git a/manifests/network.pp b/manifests/network.pp
index 0b16f7bc..b4873ab7 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -89,7 +89,7 @@ class cloud::network(
       $core_plugin = 'neutron.plugins.cisco.network_plugin.PluginV2'
     }
     default: {
-      err "${plugin} plugin is not supported."
+      fail("${plugin} plugin is not supported.")
     }
   }
 
diff --git a/manifests/network/controller.pp b/manifests/network/controller.pp
index 5e138999..cb79f6c7 100644
--- a/manifests/network/controller.pp
+++ b/manifests/network/controller.pp
@@ -259,7 +259,7 @@ class cloud::network::controller(
     }
 
     default: {
-      err "${plugin} plugin is not supported."
+      fail("${plugin} plugin is not supported.")
     }
   }
 
diff --git a/manifests/network/vswitch.pp b/manifests/network/vswitch.pp
index 10d663d6..0a00ce6c 100644
--- a/manifests/network/vswitch.pp
+++ b/manifests/network/vswitch.pp
@@ -215,7 +215,7 @@ class cloud::network::vswitch(
     }
 
     default: {
-      err "${driver} driver is not supported."
+      fail("${driver} driver is not supported.")
     }
   }
 
diff --git a/spec/classes/cloud_network_vswitch_spec.rb b/spec/classes/cloud_network_vswitch_spec.rb
index 6078ad50..d101b76e 100644
--- a/spec/classes/cloud_network_vswitch_spec.rb
+++ b/spec/classes/cloud_network_vswitch_spec.rb
@@ -133,7 +133,7 @@ describe 'cloud::network::vswitch' do
       before :each do
         params.merge!(:driver => 'Something')
       end
-      it { should compile.and_raise_error(/Something plugin is not supported./) }
+      it_raises 'a Puppet::Error', /Something driver is not supported./
     end
 
     context 'with default firewall enabled' do