diff --git a/deployment/puppet/openstack/manifests/keystone.pp b/deployment/puppet/openstack/manifests/keystone.pp
index da7b817b89..ce8c4fcb52 100644
--- a/deployment/puppet/openstack/manifests/keystone.pp
+++ b/deployment/puppet/openstack/manifests/keystone.pp
@@ -213,7 +213,7 @@ class openstack::keystone (
     debug               => $debug,
     catalog_type        => 'sql',
     admin_token         => $admin_token,
-    enabled             => false,
+    enabled             => $enabled,
     sql_connection      => $sql_conn,
     public_bind_host    => $public_bind_host,
     admin_bind_host     => $admin_bind_host,
diff --git a/deployment/puppet/osnailyfacter/modular/globals/globals.pp b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
index 6f5a8c2456..a98fc0ee51 100644
--- a/deployment/puppet/osnailyfacter/modular/globals/globals.pp
+++ b/deployment/puppet/osnailyfacter/modular/globals/globals.pp
@@ -54,7 +54,7 @@ $syslog_log_facility_ceph       = hiera('syslog_log_facility_ceph','LOG_LOCAL0')
 
 $nova_report_interval           = hiera('nova_report_interval', 60)
 $nova_service_down_time         = hiera('nova_service_down_time', 180)
-$apache_ports                   = hiera_array('apache_ports', ['80', '8888', '5000', '35357'])
+$apache_ports                   = hiera_array('apache_ports', ['80', '8888'])
 
 $openstack_version = hiera('openstack_version',
   {
diff --git a/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp b/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
index e9ae73a788..4d9c2ffb3c 100644
--- a/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
+++ b/deployment/puppet/osnailyfacter/modular/keystone/keystone.pp
@@ -110,30 +110,30 @@ class { 'openstack::keystone':
 
 ####### WSGI ###########
 
-class { 'osnailyfacter::apache':
-  listen_ports => hiera_array('apache_ports', ['80', '8888']),
-}
+#class { 'osnailyfacter::apache':
+#  listen_ports => hiera_array('apache_ports', ['80', '8888']),
+#}
 
 # TODO: (adidenko) use file from package for Debian, when
 # https://review.fuel-infra.org/6251 is merged.
-class { 'keystone::wsgi::apache':
-  priority => '05',
-  threads  => 1,
-  workers  => min(max($::processorcount,2), 24),
-  ssl      => $ssl,
+#class { 'keystone::wsgi::apache':
+#  priority => '05',
+#  threads  => 1,
+#  workers  => min(max($::processorcount,2), 24),
+#  ssl      => $ssl,
 
-  wsgi_script_ensure => $::osfamily ? {
-    'RedHat'       => 'link',
-    default        => 'file',
-  },
-  wsgi_script_source => $::osfamily ? {
-  # 'Debian'      => '/usr/share/keystone/wsgi.py',
-    'RedHat'       => '/usr/share/keystone/keystone.wsgi',
-    default        => undef,
-  },
-}
+#  wsgi_script_ensure => $::osfamily ? {
+#    'RedHat'       => 'link',
+#    default        => 'file',
+#  },
+#  wsgi_script_source => $::osfamily ? {
+#  # 'Debian'      => '/usr/share/keystone/wsgi.py',
+#    'RedHat'       => '/usr/share/keystone/keystone.wsgi',
+#    default        => undef,
+#  },
+#}
 
-include ::tweaks::apache_wrappers
+#include ::tweaks::apache_wrappers
 
 ###############################################################################
 
diff --git a/tests/noop/spec/hosts/keystone/keystone_spec.rb b/tests/noop/spec/hosts/keystone/keystone_spec.rb
index 500a947365..1951187d77 100644
--- a/tests/noop/spec/hosts/keystone/keystone_spec.rb
+++ b/tests/noop/spec/hosts/keystone/keystone_spec.rb
@@ -16,12 +16,12 @@ describe manifest do
     memcached_servers = controller_nodes.map{ |n| n = n + ':11211' }.join(',')
     admin_token = Noop.hiera_structure 'keystone/admin_token'
 
-    # Keystone
     it 'should declare keystone class with admin_token' do
       should contain_class('keystone').with(
         'admin_token' => admin_token,
       )
     end
+
     it 'should configure memcache_pool keystone cache backend' do
       should contain_keystone_config('token/caching').with(:value => 'false')
       should contain_keystone_config('cache/enabled').with(:value => 'true')
@@ -33,45 +33,45 @@ describe manifest do
       should contain_keystone_config('cache/memcache_pool_unused_timeout').with(:value => '60')
     end
 
-    it 'should declare keystone::wsgi::apache class with 4 workers on 4 CPU system' do
-      should contain_class('keystone::wsgi::apache').with(
-        'threads' => '1',
-        'workers' => '4',
-      )
-    end
-
-    it 'should declare keystone::wsgi::apache class with 24 workers on 48 CPU system' do
-      facts[:processorcount] = 48
-      should contain_class('keystone::wsgi::apache').with(
-        'threads' => '1',
-        'workers' => '24',
-      )
-    end
-
-    it 'should setup keystone_wsgi_admin file properly' do
-      case facts[:operatingsystem]
-      when 'CentOS'
-        should contain_file('keystone_wsgi_admin').with(
-          'ensure'  => 'link',
-          'path'    => "/var/www/cgi-bin/keystone/admin",
-          'target'  => '/usr/share/keystone/keystone.wsgi',
-          'owner'   => 'keystone',
-          'group'   => 'keystone',
-          'mode'    => '0644',
-          'require' => "File[/var/www/cgi-bin/keystone]"
-        )
-      when 'Ubuntu'
-        should contain_file('keystone_wsgi_admin').with(
-          'ensure'  => 'file',
-          'path'    => "/usr/lib/cgi-bin/keystone/admin",
-          'source'  => 'puppet:///modules/keystone/httpd/keystone.py',
-          'owner'   => 'keystone',
-          'group'   => 'keystone',
-          'mode'    => '0644',
-          'require' => "File[/usr/lib/cgi-bin/keystone]"
-        )
-      end
-    end
+    # it 'should declare keystone::wsgi::apache class with 4 workers on 4 CPU system' do
+    #   should contain_class('keystone::wsgi::apache').with(
+    #     'threads' => '1',
+    #     'workers' => '4',
+    #   )
+    # end
+    #
+    # it 'should declare keystone::wsgi::apache class with 24 workers on 48 CPU system' do
+    #   facts[:processorcount] = 48
+    #   should contain_class('keystone::wsgi::apache').with(
+    #     'threads' => '1',
+    #     'workers' => '24',
+    #   )
+    # end
+    #
+    # it 'should setup keystone_wsgi_admin file properly' do
+    #   case facts[:operatingsystem]
+    #   when 'CentOS'
+    #     should contain_file('keystone_wsgi_admin').with(
+    #       'ensure'  => 'link',
+    #       'path'    => "/var/www/cgi-bin/keystone/admin",
+    #       'target'  => '/usr/share/keystone/keystone.wsgi',
+    #       'owner'   => 'keystone',
+    #       'group'   => 'keystone',
+    #       'mode'    => '0644',
+    #       'require' => "File[/var/www/cgi-bin/keystone]"
+    #     )
+    #   when 'Ubuntu'
+    #     should contain_file('keystone_wsgi_admin').with(
+    #       'ensure'  => 'file',
+    #       'path'    => "/usr/lib/cgi-bin/keystone/admin",
+    #       'source'  => 'puppet:///modules/keystone/httpd/keystone.py',
+    #       'owner'   => 'keystone',
+    #       'group'   => 'keystone',
+    #       'mode'    => '0644',
+    #       'require' => "File[/usr/lib/cgi-bin/keystone]"
+    #     )
+    #   end
+    # end
 
   end # end of shared_examples