diff --git a/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb b/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb
index e8bdc06aa..b3912ee11 100644
--- a/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb
+++ b/lib/puppet/provider/neutron_fwaas_service_config/ini_setting.rb
@@ -1,3 +1,4 @@
+# DEPRECATED!
 Puppet::Type.type(:neutron_fwaas_service_config).provide(
   :ini_setting,
   :parent => Puppet::Type.type(:openstack_config).provider(:ini_setting)
diff --git a/lib/puppet/type/neutron_fwaas_service_config.rb b/lib/puppet/type/neutron_fwaas_service_config.rb
index 1159f0b36..2aa88b84c 100644
--- a/lib/puppet/type/neutron_fwaas_service_config.rb
+++ b/lib/puppet/type/neutron_fwaas_service_config.rb
@@ -1,3 +1,4 @@
+# DEPRECATED!
 Puppet::Type.newtype(:neutron_fwaas_service_config) do
 
   ensurable
diff --git a/manifests/server.pp b/manifests/server.pp
index 915b8fee0..2b8eff10e 100644
--- a/manifests/server.pp
+++ b/manifests/server.pp
@@ -173,11 +173,6 @@
 #   Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled.
 #   Defaults to false.
 #
-# [*ensure_fwaas_package*]
-#   (Optional) Ensures installation of FWaaS package before starting API service.
-#   Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled.
-#   Defaults to false.
-#
 # [*ensure_dr_package*]
 #   (Optional) Ensures installation of Neutron Dynamic Routing package before starting API service.
 #   Set to true to ensure installation of the package that is required to start neutron service if bgp service_plugin is enabled.
@@ -191,7 +186,6 @@
 #
 # [*service_providers*]
 #   (Optional) (Array) Configures the service providers for neutron server.
-#   This needs to be set for vpnaas, fwaas etc.
 #   Defaults to $::os_service_default
 #
 #   Example:
@@ -261,6 +255,11 @@
 #   (Optional) If set, use this value for max_overflow with sqlalchemy.
 #   Defaults to: undef.
 #
+# [*ensure_fwaas_package*]
+#   (Optional) Ensures installation of FWaaS package before starting API service.
+#   Set to true to ensure installation of the package that is required to start neutron service if service_plugin is enabled.
+#   Defaults to undef.
+#
 class neutron::server (
   $package_ensure                   = 'present',
   $enabled                          = true,
@@ -291,7 +290,6 @@ class neutron::server (
   $l3_ha_net_cidr                   = $::os_service_default,
   $network_auto_schedule            = $::os_service_default,
   $ensure_vpnaas_package            = false,
-  $ensure_fwaas_package             = false,
   $ensure_dr_package                = false,
   $vpnaas_agent_package             = false,
   $service_providers                = $::os_service_default,
@@ -308,6 +306,7 @@ class neutron::server (
   $database_retry_interval          = undef,
   $database_max_pool_size           = undef,
   $database_max_overflow            = undef,
+  $ensure_fwaas_package             = undef,
 ) inherits ::neutron::params {
 
   include neutron::deps
@@ -330,6 +329,8 @@ class neutron::server (
   }
 
   if $ensure_fwaas_package {
+    warning('neutron::server::ensure_fwaas_package is deprecated and will be removed in a future release')
+
     if ($::osfamily == 'Debian') {
       # Debian platforms
       if $vpnaas_agent_package {
diff --git a/manifests/services/fwaas.pp b/manifests/services/fwaas.pp
index 851681537..6b094fd17 100644
--- a/manifests/services/fwaas.pp
+++ b/manifests/services/fwaas.pp
@@ -16,6 +16,8 @@
 # under the License.
 #
 #
+# DEPRECATED!!!
+#
 # == Class: neutron::services::fwaas
 #
 # Configure the Firewall as a Service Neutron Plugin
@@ -57,6 +59,8 @@ class neutron::services::fwaas (
   include neutron::deps
   include neutron::params
 
+  warning('neutron::services:fwaas is deprecated and will be removed in a future release.')
+
   if ($::osfamily == 'Debian') {
     # Debian platforms
     if $vpnaas_agent_package {
diff --git a/releasenotes/notes/deprecate-fwaas-6dc31e22fdd10c8d.yaml b/releasenotes/notes/deprecate-fwaas-6dc31e22fdd10c8d.yaml
new file mode 100644
index 000000000..894616c6e
--- /dev/null
+++ b/releasenotes/notes/deprecate-fwaas-6dc31e22fdd10c8d.yaml
@@ -0,0 +1,11 @@
+---
+deprecations:
+  - |
+    The neutron::server::ensure_fwaas_package is deprecated and will be removed
+    in a future release.
+  - |
+    The neutron::services::fwaas class is deprecated and will be removed in
+    a future release.
+  - |
+    The neutron_fwaas_service_config resource is deprecated and will be removed
+    in a future release.