diff --git a/manifests/init.pp b/manifests/init.pp
index 35860f252..2585bb2ca 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -631,14 +631,8 @@ class keystone(
     warning('Execution of db_sync does not depend on $enabled anymore. Please use sync_db instead.')
   }
 
-  if ($service_name == 'keystone-public-keystone-admin') {
-    warning('The value keystone-public-keystone-admin for the Keystone service name is deprecated. \
-Use keystone instead')
-  }
-
-
   case $service_name {
-    $::keystone::params::service_name, 'keystone-public-keystone-admin' : {
+    $::keystone::params::service_name: {
       $service_name_real = $::keystone::params::service_name
 
       class { 'keystone::service':
diff --git a/manifests/service.pp b/manifests/service.pp
index 9d7a9b16a..5e77444d1 100644
--- a/manifests/service.pp
+++ b/manifests/service.pp
@@ -34,32 +34,12 @@ class keystone::service (
 
   include keystone::deps
 
-  if $service_name == 'keystone-public-keystone-admin' {
-    service { 'keystone-public':
-      ensure     => $ensure,
-      name       => 'keystone-public',
-      enable     => $enable,
-      hasstatus  => $hasstatus,
-      hasrestart => $hasrestart,
-      tag        => 'keystone-service',
-    }
-
-    service { 'keystone-admin':
-      ensure     => $ensure,
-      name       => 'keystone-admin',
-      enable     => $enable,
-      hasstatus  => $hasstatus,
-      hasrestart => $hasrestart,
-      tag        => 'keystone-service',
-    }
-  } else {
-    service { 'keystone':
-      ensure     => $ensure,
-      name       => $service_name,
-      enable     => $enable,
-      hasstatus  => $hasstatus,
-      hasrestart => $hasrestart,
-      tag        => 'keystone-service',
-    }
+  service { 'keystone':
+    ensure     => $ensure,
+    name       => $service_name,
+    enable     => $enable,
+    hasstatus  => $hasstatus,
+    hasrestart => $hasrestart,
+    tag        => 'keystone-service',
   }
 }
diff --git a/releasenotes/notes/remove-keystone-public-keystone-admin-b707640b1a8ec8c3.yaml b/releasenotes/notes/remove-keystone-public-keystone-admin-b707640b1a8ec8c3.yaml
new file mode 100644
index 000000000..1c485a630
--- /dev/null
+++ b/releasenotes/notes/remove-keystone-public-keystone-admin-b707640b1a8ec8c3.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+  - |
+    ``keystone-public-keystone-admin`` is no longer supported as a valid
+     service_name. Use ``keystone/openstack-keystone`` or ``httpd`` instead.
diff --git a/spec/classes/keystone_service_spec.rb b/spec/classes/keystone_service_spec.rb
index 975bba57e..0ca1eb44d 100644
--- a/spec/classes/keystone_service_spec.rb
+++ b/spec/classes/keystone_service_spec.rb
@@ -35,58 +35,6 @@ describe 'keystone::service' do
         :hasrestart => false,
       )}
     end
-
-    context 'with service_name set to keystone-public-keystone-admin' do
-      before do
-        params.merge!( :service_name => 'keystone-public-keystone-admin' )
-      end
-
-      it { is_expected.to contain_service('keystone-public').with(
-        :ensure     => nil,
-        :name       => 'keystone-public',
-        :enable     => true,
-        :hasstatus  => true,
-        :hasrestart => true,
-        :tag        => 'keystone-service',
-      )}
-
-      it { is_expected.to contain_service('keystone-admin').with(
-        :ensure     => nil,
-        :name       => 'keystone-admin',
-        :enable     => true,
-        :hasstatus  => true,
-        :hasrestart => true,
-        :tag        => 'keystone-service',
-      )}
-    end
-
-    context 'with overriden parameters and service_name set to keystone-public-keystone-admin' do
-      before do
-        params.merge!(
-          :ensure       => 'present',
-          :service_name => 'keystone-public-keystone-admin',
-          :enable       => false,
-          :hasstatus    => false,
-          :hasrestart   => false
-        )
-      end
-
-      it { is_expected.to contain_service('keystone-public').with(
-        :ensure     => 'present',
-        :name       => 'keystone-public',
-        :enable     => false,
-        :hasstatus  => false,
-        :hasrestart => false,
-      )}
-
-      it { is_expected.to contain_service('keystone-admin').with(
-        :ensure     => 'present',
-        :name       => 'keystone-admin',
-        :enable     => false,
-        :hasstatus  => false,
-        :hasrestart => false,
-      )}
-    end
   end
 
   on_supported_os({