diff --git a/manifests/bootstrap.pp b/manifests/bootstrap.pp
index cefb0a968..ee455a076 100644
--- a/manifests/bootstrap.pp
+++ b/manifests/bootstrap.pp
@@ -159,15 +159,6 @@ class keystone::bootstrap (
     })
   }
 
-  # NOTE(tkajinam): puppet.conf is no longer required and now clouds.yaml
-  #                 is used instead.
-  # TODO(tkajinam): Remove this after Y release.
-  file { '/etc/keystone/puppet.conf':
-    ensure  => 'absent',
-    require => Anchor['keystone::config::begin'],
-    before  => Anchor['keystone::config::end'],
-  }
-
   $auth_url_real = $interface ? {
     'admin'    => $admin_url,
     'internal' => $internal_url_real,
diff --git a/spec/classes/keystone_bootstrap_spec.rb b/spec/classes/keystone_bootstrap_spec.rb
index c9ff4568e..abf1c0123 100644
--- a/spec/classes/keystone_bootstrap_spec.rb
+++ b/spec/classes/keystone_bootstrap_spec.rb
@@ -70,12 +70,6 @@ describe 'keystone::bootstrap' do
         :internal_url => 'http://127.0.0.1:5000',
       )}
 
-      it { is_expected.to contain_file('/etc/keystone/puppet.conf').with(
-        :ensure  => 'absent',
-        :require => 'Anchor[keystone::config::begin]',
-        :before  => 'Anchor[keystone::config::end]',
-      )}
-
       it { is_expected.to contain_file('/etc/openstack').with(
         :ensure  => 'directory',
         :mode    => '0755',
@@ -180,12 +174,6 @@ describe 'keystone::bootstrap' do
         :internal_url => 'http://internal:1342',
       )}
 
-      it { is_expected.to contain_file('/etc/keystone/puppet.conf').with(
-        :ensure  => 'absent',
-        :require => 'Anchor[keystone::config::begin]',
-        :before  => 'Anchor[keystone::config::end]',
-      )}
-
       it { is_expected.to contain_file('/etc/openstack').with(
         :ensure  => 'directory',
         :mode    => '0755',
@@ -231,12 +219,6 @@ describe 'keystone::bootstrap' do
       it { is_expected.to_not contain_keystone_service('keystone::identity') }
       it { is_expected.to_not contain_keystone_endpoint('RegionOne/keystone::identity') }
 
-      it { is_expected.to contain_file('/etc/keystone/puppet.conf').with(
-        :ensure  => 'absent',
-        :require => 'Anchor[keystone::config::begin]',
-        :before  => 'Anchor[keystone::config::end]',
-      )}
-
       it { is_expected.to contain_file('/etc/openstack').with(
         :ensure  => 'directory',
         :mode    => '0755',