diff --git a/manifests/haproxy.pp b/manifests/haproxy.pp
index bff33a91f..3109852bd 100644
--- a/manifests/haproxy.pp
+++ b/manifests/haproxy.pp
@@ -200,10 +200,6 @@
 #  (optional) Enable or not Manila API binding
 #  Defaults to hiera('manila_api_enabled', false)
 #
-# [*sahara*]
-#  (optional) Enable or not Sahara API binding
-#  defaults to hiera('sahara_api_enabled', false)
-#
 # [*glance_api*]
 #  (optional) Enable or not Glance API binding
 #  Defaults to hiera('glance_api_enabled', false)
@@ -471,10 +467,6 @@
 #  (optional) Specify the network ovn_dbs is running on.
 #  Defaults to hiera('ovn_dbs_network', undef)
 #
-# [*sahara_network*]
-#  (optional) Specify the network sahara is running on.
-#  Defaults to hiera('sahara_api_network', undef)
-#
 # [*swift_proxy_server_network*]
 #  (optional) Specify the network swift_proxy_server is running on.
 #  Defaults to hiera('swift_proxy_network', undef)
@@ -533,8 +525,6 @@
 #    'ovn_nbdb_ssl_port' (Defaults to 13641)
 #    'ovn_sbdb_port' (Defaults to 6642)
 #    'ovn_sbdb_ssl_port' (Defaults to 13642)
-#    'sahara_api_port' (Defaults to 8386)
-#    'sahara_api_ssl_port' (Defaults to 13386)
 #    'swift_proxy_port' (Defaults to 8080)
 #    'swift_proxy_ssl_port' (Defaults to 13808)
 #    'zaqar_api_port' (Defaults to 8888)
@@ -589,7 +579,6 @@ class tripleo::haproxy (
   $neutron                     = hiera('neutron_api_enabled', false),
   $cinder                      = hiera('cinder_api_enabled', false),
   $manila                      = hiera('manila_api_enabled', false),
-  $sahara                      = hiera('sahara_api_enabled', false),
   $glance_api                  = hiera('glance_api_enabled', false),
   $nova_osapi                  = hiera('nova_api_enabled', false),
   $placement                   = hiera('placement_enabled', false),
@@ -655,7 +644,6 @@ class tripleo::haproxy (
   $octavia_network             = hiera('octavia_api_network', undef),
   $ovn_dbs_network             = hiera('ovn_dbs_network', undef),
   $etcd_network                = hiera('etcd_network', undef),
-  $sahara_network              = hiera('sahara_api_network', undef),
   $swift_proxy_server_network  = hiera('swift_proxy_network', undef),
   $zaqar_api_network           = hiera('zaqar_api_network', undef),
   $zaqar_ws_timeout_tunnel     = hiera('zaqar_ws_timeout_tunnel', '14400'),
@@ -708,8 +696,6 @@ class tripleo::haproxy (
     ovn_nbdb_ssl_port => 13641,
     ovn_sbdb_port => 6642,
     ovn_sbdb_ssl_port => 13642,
-    sahara_api_port => 8386,
-    sahara_api_ssl_port => 13386,
     swift_proxy_port => 8080,
     swift_proxy_ssl_port => 13808,
     zaqar_api_port => 8888,
@@ -921,19 +907,6 @@ class tripleo::haproxy (
     }
   }
 
-  if $sahara {
-    ::tripleo::haproxy::endpoint { 'sahara':
-      public_virtual_ip => $public_virtual_ip,
-      internal_ip       => hiera('sahara_api_vip', $controller_virtual_ip),
-      service_port      => $ports[sahara_api_port],
-      ip_addresses      => hiera('sahara_api_node_ips', $controller_hosts_real),
-      server_names      => hiera('sahara_api_node_names', $controller_hosts_names_real),
-      mode              => 'http',
-      public_ssl_port   => $ports[sahara_api_ssl_port],
-      service_network   => $sahara_network,
-    }
-  }
-
   if $glance_api {
     ::tripleo::haproxy::endpoint { 'glance_api':
       public_virtual_ip => $public_virtual_ip,
diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp
index 7fa0a2339..73a814d49 100644
--- a/manifests/profile/base/database/mysql.pp
+++ b/manifests/profile/base/database/mysql.pp
@@ -285,9 +285,6 @@ class tripleo::profile::base::database::mysql (
     if hiera('octavia_api_enabled', false) {
       tripleo::profile::base::database::mysql::include_and_check_auth{'octavia::db::mysql':}
     }
-    if hiera('sahara_api_enabled', false) {
-      tripleo::profile::base::database::mysql::include_and_check_auth{'sahara::db::mysql':}
-    }
     if hiera('zaqar_api_enabled', false) and hiera('zaqar::db::mysql::user', '') == 'zaqar' {
       # NOTE: by default zaqar uses sqlalchemy
       tripleo::profile::base::database::mysql::include_and_check_auth{'zaqar::db::mysql':}
diff --git a/manifests/profile/base/sahara.pp b/manifests/profile/base/sahara.pp
deleted file mode 100644
index 02db9e6c9..000000000
--- a/manifests/profile/base/sahara.pp
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Class: tripleo::profile::base::sahara
-#
-# Sahara server profile for tripleo
-#
-# === Parameters
-#
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('sahara_engine_short_bootstrap_node_name')
-#
-# [*step*]
-#   (Optional) The current step of the deployment
-#   Defaults to hiera('step')
-#
-# [*oslomsg_rpc_proto*]
-#   Protocol driver for the oslo messaging rpc service
-#   Defaults to hiera('oslo_messaging_rpc_scheme', rabbit)
-#
-# [*oslomsg_rpc_hosts*]
-#   list of the oslo messaging rpc host fqdns
-#   Defaults to hiera('oslo_messaging_rpc_node_names')
-#
-# [*oslomsg_rpc_port*]
-#   IP port for oslo messaging rpc service
-#   Defaults to hiera('oslo_messaging_rpc_port', 5672)
-#
-# [*oslomsg_rpc_username*]
-#   Username for oslo messaging rpc service
-#   Defaults to hiera('oslo_messaging_rpc_user_name', 'guest')
-#
-# [*oslomsg_rpc_password*]
-#   Password for oslo messaging rpc service
-#   Defaults to hiera('oslo_messaging_rpc_password')
-#
-# [*oslomsg_rpc_use_ssl*]
-#   Enable ssl oslo messaging services
-#   Defaults to hiera('oslo_messaging_rpc_use_ssl', '0')
-#
-# [*oslomsg_notify_proto*]
-#   Protocol driver for the oslo messaging notify service
-#   Defaults to hiera('oslo_messaging_notify_scheme', rabbit)
-#
-# [*oslomsg_notify_hosts*]
-#   list of the oslo messaging notify host fqdns
-#   Defaults to hiera('oslo_messaging_notify_node_names')
-#
-# [*oslomsg_notify_port*]
-#   IP port for oslo messaging notify service
-#   Defaults to hiera('oslo_messaging_notify_port', 5672)
-#
-# [*oslomsg_notify_username*]
-#   Username for oslo messaging notify service
-#   Defaults to hiera('oslo_messaging_notify_user_name', 'guest')
-#
-# [*oslomsg_notify_password*]
-#   Password for oslo messaging notify service
-#   Defaults to hiera('oslo_messaging_notify_password')
-#
-# [*oslomsg_notify_use_ssl*]
-#   Enable ssl oslo messaging services
-#   Defaults to hiera('oslo_messaging_notify_use_ssl', '0')
-
-class tripleo::profile::base::sahara (
-  $bootstrap_node          = hiera('sahara_engine_short_bootstrap_node_name', undef),
-  $step                    = Integer(hiera('step')),
-  $oslomsg_rpc_proto       = hiera('oslo_messaging_rpc_scheme', 'rabbit'),
-  $oslomsg_rpc_hosts       = any2array(hiera('oslo_messaging_rpc_node_names', undef)),
-  $oslomsg_rpc_password    = hiera('oslo_messaging_rpc_password'),
-  $oslomsg_rpc_port        = hiera('oslo_messaging_rpc_port', '5672'),
-  $oslomsg_rpc_username    = hiera('oslo_messaging_rpc_user_name', 'guest'),
-  $oslomsg_rpc_use_ssl     = hiera('oslo_messaging_rpc_use_ssl', '0'),
-  $oslomsg_notify_proto    = hiera('oslo_messaging_notify_scheme', 'rabbit'),
-  $oslomsg_notify_hosts    = any2array(hiera('oslo_messaging_notify_node_names', undef)),
-  $oslomsg_notify_password = hiera('oslo_messaging_notify_password'),
-  $oslomsg_notify_port     = hiera('oslo_messaging_notify_port', '5672'),
-  $oslomsg_notify_username = hiera('oslo_messaging_notify_user_name', 'guest'),
-  $oslomsg_notify_use_ssl  = hiera('oslo_messaging_notify_use_ssl', '0'),
-) {
-  if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
-
-  if $step >= 4 or ($step >= 3 and $sync_db){
-    $oslomsg_rpc_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_rpc_use_ssl)))
-    $oslomsg_notify_use_ssl_real = sprintf('%s', bool2num(str2bool($oslomsg_notify_use_ssl)))
-    class { 'sahara':
-      sync_db               => $sync_db,
-      default_transport_url => os_transport_url({
-        'transport' => $oslomsg_rpc_proto,
-        'hosts'     => $oslomsg_rpc_hosts,
-        'port'      => $oslomsg_rpc_port,
-        'username'  => $oslomsg_rpc_username,
-        'password'  => $oslomsg_rpc_password,
-        'ssl'       => $oslomsg_rpc_use_ssl_real,
-      }),
-    }
-    class { 'sahara::notify':
-      notification_transport_url => os_transport_url({
-        'transport' => $oslomsg_notify_proto,
-        'hosts'     => $oslomsg_notify_hosts,
-        'port'      => $oslomsg_notify_port,
-        'username'  => $oslomsg_notify_username,
-        'password'  => $oslomsg_notify_password,
-        'ssl'       => $oslomsg_notify_use_ssl_real,
-      }),
-    }
-    include sahara::keystone::authtoken
-    include sahara::config
-    include sahara::logging
-  }
-}
diff --git a/manifests/profile/base/sahara/api.pp b/manifests/profile/base/sahara/api.pp
deleted file mode 100644
index 52381f93b..000000000
--- a/manifests/profile/base/sahara/api.pp
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Class: tripleo::profile::base::sahara::api
-#
-# Sahara API profile for tripleo
-#
-# === Parameters
-#
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-class tripleo::profile::base::sahara::api (
-  $step = Integer(hiera('step')),
-) {
-  include tripleo::profile::base::sahara
-
-  if $step >= 4 {
-    include sahara::service::api
-  }
-}
diff --git a/manifests/profile/base/sahara/engine.pp b/manifests/profile/base/sahara/engine.pp
deleted file mode 100644
index f45e03d7d..000000000
--- a/manifests/profile/base/sahara/engine.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2016 Red Hat, Inc.
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-#
-# == Class: tripleo::profile::base::sahara::engine
-#
-# Sahara API profile for tripleo
-#
-# === Parameters
-#
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('sahara_engine_short_bootstrap_node_name')
-#
-# [*step*]
-#   (Optional) The current step in deployment. See tripleo-heat-templates
-#   for more details.
-#   Defaults to hiera('step')
-#
-class tripleo::profile::base::sahara::engine (
-  $bootstrap_node = hiera('sahara_engine_short_bootstrap_node_name', undef),
-  $step           = Integer(hiera('step')),
-) {
-  if $bootstrap_node and $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
-
-  include tripleo::profile::base::sahara
-
-  if $step >= 4 or ($step >= 3 and $sync_db) {
-    include sahara::service::engine
-  }
-}