diff --git a/manifests/api.pp b/manifests/api.pp
index 15b5a6e2f..82a3c92ba 100644
--- a/manifests/api.pp
+++ b/manifests/api.pp
@@ -421,8 +421,8 @@ class nova::api(
     # make sure we start apache before nova-api to avoid binding issues
     Service[$service_name] -> Service['nova-api']
   } else {
-    fail('Invalid service_name. Either nova-api/openstack-nova-api for running \
-          as a standalone service, or httpd for being run by a httpd server')
+    fail("Invalid service_name. Either nova-api/openstack-nova-api for running \
+as a standalone service, or httpd for being run by a httpd server")
   }
 
   nova::generic_service { 'api':
diff --git a/manifests/compute.pp b/manifests/compute.pp
index fdbf9b7f8..3710947b9 100644
--- a/manifests/compute.pp
+++ b/manifests/compute.pp
@@ -185,18 +185,18 @@ class nova::compute (
   include ::nova::params
 
   if $default_availability_zone {
-    warning('The default_availability_zone parameter is deprecated and will be removed in a \
-              future release. Use default_availability_zone parameter of nova class instead.')
+    warning("The default_availability_zone parameter is deprecated and will be removed in a \
+future release. Use default_availability_zone parameter of nova class instead.")
   }
 
   if $default_schedule_zone {
-    warning('The default_schedule_zone parameter is deprecated and will be removed in a \
-              future release. Use default_schedule_zone parameter of nova class instead.')
+    warning("The default_schedule_zone parameter is deprecated and will be removed in a \
+future release. Use default_schedule_zone parameter of nova class instead.")
   }
 
   if $internal_service_availability_zone {
-    warning('The internal_service_availability_zone parameter is deprecated and will be \
-              removed in a future release. Use internal_service_availability_zone parameter of nova class instead.')
+    warning("The internal_service_availability_zone parameter is deprecated and will be \
+removed in a future release. Use internal_service_availability_zone parameter of nova class instead.")
   }
 
   if $network_device_mtu {
@@ -204,8 +204,8 @@ class nova::compute (
   }
 
   if $compute_manager {
-    warning('compute_manager is marked as deprecated in Nova but still needed when Ironic \
-              is used. It will be removed once Nova removes it.')
+    warning("compute_manager is marked as deprecated in Nova but still needed when Ironic \
+is used. It will be removed once Nova removes it.")
   }
 
   $vcpu_pin_set_real = pick(join(any2array($vcpu_pin_set), ','), $::os_service_default)
diff --git a/manifests/init.pp b/manifests/init.pp
index a9c7d26d9..b02dfe42b 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -596,7 +596,7 @@ class nova(
 
       if ! $nova_private_key_file {
         fail("Unable to determine name of private key file.  Type specified was '${nova_private_key['type']}' \
-              but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
+but should be one of: ssh-rsa, ssh-dsa, ssh-ecdsa.")
       }
 
       file { $nova_private_key_file:
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
index 4234e4877..3f500c9a6 100644
--- a/manifests/keystone/auth.pp
+++ b/manifests/keystone/auth.pp
@@ -113,8 +113,9 @@ class nova::keystone::auth(
 
   if $auth_name_v3 or $service_description_v3 or $service_name_v3 or
       $public_url_v3 or $internal_url_v3 or $admin_url_v3 or $configure_endpoint_v3 {
-    warning('all parameters related to v3 API in nova::keystone::auth are \
-              deprecated, have no effect and will be removed after Newton release.')
+
+    warning("all parameters related to v3 API in nova::keystone::auth are \
+deprecated, have no effect and will be removed after Newton release.")
   }
 
   if $configure_endpoint {
diff --git a/manifests/network.pp b/manifests/network.pp
index d39f1415b..64c696f1d 100644
--- a/manifests/network.pp
+++ b/manifests/network.pp
@@ -203,7 +203,7 @@ class nova::network(
     }
     default: {
       fail("Unsupported network manager: ${nova::network_manager} The supported network managers are \
-            nova.network.manager.FlatManager, nova.network.FlatDHCPManager and nova.network.manager.VlanManager")
+nova.network.manager.FlatManager, nova.network.FlatDHCPManager and nova.network.manager.VlanManager")
     }
   }
 
diff --git a/manifests/params.pp b/manifests/params.pp
index d4552381a..b3787d426 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -134,7 +134,7 @@ class nova::params {
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \
-            module ${module_name} only support osfamily RedHat and Debian")
+module ${module_name} only support osfamily RedHat and Debian")
     }
   }