diff --git a/fixtures/scenario003.pp b/fixtures/scenario003.pp
index b7148dace..12fb9cb63 100644
--- a/fixtures/scenario003.pp
+++ b/fixtures/scenario003.pp
@@ -21,8 +21,6 @@ case $::osfamily {
     $mistral_enabled = false
     # murano package should be fixed on Ubuntu Xenial
     $murano_enabled  = false
-    # TODO(aschultz): sahara is currently missing from xenial pike
-    $sahara_enabled  = false
     # trove package contains broken Tempest tests
     $trove           = false
   }
@@ -30,7 +28,6 @@ case $::osfamily {
     $ipv6            = true
     $mistral_enabled = true
     $murano_enabled  = true
-    $sahara_enabled  = true
     $trove_enabled   = true
   }
   default: {
@@ -72,9 +69,7 @@ if $trove_enabled {
 }
 include ::openstack_integration::horizon
 include ::openstack_integration::heat
-if $sahara_enabled {
-  include ::openstack_integration::sahara
-}
+include ::openstack_integration::sahara
 if $designate_enabled {
   include ::openstack_integration::designate
 }
diff --git a/manifests/sahara.pp b/manifests/sahara.pp
index 5ba065179..d15e18ffc 100644
--- a/manifests/sahara.pp
+++ b/manifests/sahara.pp
@@ -65,32 +65,29 @@ class openstack_integration::sahara {
   class { '::sahara::client': }
   class { '::sahara::notify': }
 
-  # for ubuntu we need saharaclient >= 0.15.0
-  if $::osfamily == 'RedHat' {
-    # create simple sahara templates
-    sahara_node_group_template { 'master':
-      ensure         => present,
-      plugin         => 'vanilla',
-      plugin_version => '2.7.1',
-      flavor         => 'm1.micro',
-      node_processes => [ 'namenode', 'resourcemanager' ],
-    }
-
-    sahara_node_group_template { 'worker':
-      ensure         => present,
-      plugin         => 'vanilla',
-      plugin_version => '2.7.1',
-      flavor         => 'm1.micro',
-      node_processes => [ 'datanode', 'nodemanager' ],
-    }
-
-    sahara_cluster_template { 'cluster':
-      ensure      => present,
-      node_groups => [ 'master:1', 'worker:2' ]
-    }
-
-    Nova_flavor<||> -> Sahara_node_group_template<||>
-    Class['::sahara::keystone::auth'] -> Sahara_node_group_template<||>
-    Class['::openstack_extras::auth_file'] -> Sahara_node_group_template<||>
+  # create simple sahara templates
+  sahara_node_group_template { 'master':
+    ensure         => present,
+    plugin         => 'vanilla',
+    plugin_version => '2.7.1',
+    flavor         => 'm1.micro',
+    node_processes => [ 'namenode', 'resourcemanager' ],
   }
+
+  sahara_node_group_template { 'worker':
+    ensure         => present,
+    plugin         => 'vanilla',
+    plugin_version => '2.7.1',
+    flavor         => 'm1.micro',
+    node_processes => [ 'datanode', 'nodemanager' ],
+  }
+
+  sahara_cluster_template { 'cluster':
+    ensure      => present,
+    node_groups => [ 'master:1', 'worker:2' ]
+  }
+
+  Nova_flavor<||> -> Sahara_node_group_template<||>
+  Class['::sahara::keystone::auth'] -> Sahara_node_group_template<||>
+  Class['::openstack_extras::auth_file'] -> Sahara_node_group_template<||>
 }