diff --git a/attributes/default.rb b/attributes/default.rb
index 87897aa..a371e07 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -138,13 +138,6 @@ default['openstack']['identity']['credential']['keys'] = [0, 1]
 default['openstack']['identity']['conf']['credential']['key_repository'] =
   '/etc/keystone/credential-tokens'
 
-# The external (REMOTE_USER) auth plugin module. (String value)
-default['openstack']['identity']['auth']['external'] = 'keystone.auth.plugins.external.DefaultDomain'
-# Default auth methods. (List value)
-default['openstack']['identity']['auth']['methods'] = 'external, password, token, oauth1'
-# Default auth_version for now
-default['openstack']['identity']['auth']['version'] = 'v3'
-
 # configuration directory for keystone domain specific options
 default['openstack']['identity']['identity']['domain_config_dir'] = '/etc/keystone/domains'
 
diff --git a/attributes/keystone_conf.rb b/attributes/keystone_conf.rb
index f30c211..c39e1ca 100644
--- a/attributes/keystone_conf.rb
+++ b/attributes/keystone_conf.rb
@@ -18,11 +18,6 @@ default['openstack']['identity']['conf'].tap do |conf|
   # [assignment] option in keystone.conf to set driver
   conf['assignment']['driver'] = 'sql'
 
-  # [auth] option in keystone.conf to set auth plugins
-  conf['auth']['external'] = 'DefaultDomain'
-  # [auth] option in keystone.conf to set auth methods
-  conf['auth']['methods'] = 'external, password, token, oauth1'
-
   # [cache] option in keystone.conf to set oslo backend
   conf['cache']['enabled'] = true
   conf['cache']['backend'] = 'oslo_cache.memcache_pool'
diff --git a/metadata.rb b/metadata.rb
index 2144cb6..8ec89f2 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -4,7 +4,7 @@ maintainer_email 'openstack-dev@lists.openstack.org'
 license          'Apache-2.0'
 description      'The OpenStack Identity service Keystone.'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-version          '17.0.0'
+version          '17.1.0'
 
 %w(ubuntu redhat centos).each do |os|
   supports os
@@ -13,7 +13,7 @@ end
 depends 'openstack-common', '>= 17.0.0'
 depends 'openstackclient'
 
-depends 'apache2'
+depends 'apache2', '< 6'
 
 issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)
 source_url 'https://github.com/openstack/cookbook-openstack-identity' if respond_to?(:source_url)