diff --git a/manifests/roles.pp b/manifests/roles.pp
index cf0c9f96..40eaf6c2 100644
--- a/manifests/roles.pp
+++ b/manifests/roles.pp
@@ -7,25 +7,21 @@
 # [*role_names*]
 #   (optional) Create keystone roles to comply with Octavia policies.
 #   Defaults to ['load-balancer_observer', 'load-balancer_global_observer',
-#   'load-balancer_member', 'load-balancer_quota_admin', 'load-balancer_admin',
-#   'admin']
+#   'load-balancer_member', 'load-balancer_quota_admin', 'load-balancer_admin']
 #
 class octavia::roles (
-  $role_names = [
-      'load-balancer_observer',
-      'load-balancer_global_observer',
-      'load-balancer_member',
-      'load-balancer_quota_admin',
-      'load-balancer_admin',
-      'admin',
+  Array[String[1]] $role_names = [
+    'load-balancer_observer',
+    'load-balancer_global_observer',
+    'load-balancer_member',
+    'load-balancer_quota_admin',
+    'load-balancer_admin',
   ]
 ) {
 
   warning('The octavia::roles class is deprecated and will be removed')
 
-  if $role_names {
-    keystone_role { $role_names:
-      ensure => present,
-    }
+  keystone_role { $role_names:
+    ensure => present,
   }
 }
diff --git a/spec/classes/octavia_roles_spec.rb b/spec/classes/octavia_roles_spec.rb
index f03255cd..2231675c 100644
--- a/spec/classes/octavia_roles_spec.rb
+++ b/spec/classes/octavia_roles_spec.rb
@@ -2,11 +2,6 @@ require 'spec_helper'
 
 describe 'octavia::roles' do
 
-  let :params do
-    {
-    }
-  end
-
   shared_examples_for 'octavia-roles' do
 
     context 'when using default args' do
@@ -16,15 +11,14 @@ describe 'octavia::roles' do
         is_expected.to contain_keystone_role('load-balancer_member')
         is_expected.to contain_keystone_role('load-balancer_quota_admin')
         is_expected.to contain_keystone_role('load-balancer_admin')
-        is_expected.to contain_keystone_role('admin')
       end
     end
 
     context 'when using custom roles' do
-      before do
-        params.merge!({
+      let :params do
+        {
           :role_names => ['foo', 'bar', 'krispy']
-        })
+        }
       end
       it 'creates custom keystone roles' do
         is_expected.to contain_keystone_role('foo')