Don't create _member_ role from puppet

The _member_ role is provided by db migration or is created
automatically when user is created. Creating role _member_ from
puppet causes it to have different id than the one specified in
member_role_id keystone config option.

Change-Id: I3f0102b184a484f5e5a85cadf26ed651829fbf8c
Closes-Bug: rhbz#1129760

Author: xbezdick

manifests/roles/admin.pp

@@ -6,7 +6,6 @@
 #   * "admin" tenant (defaults to "openstack")
 #   * admin user (that defaults to the "admin" tenant)
 #   * admin role
-#   * _member_ role
 #   * adds admin role to admin user on the "admin" tenant
 #
 # [*Parameters*]
@@ -58,7 +57,7 @@
     password              => $password,
     ignore_default_tenant => $ignore_default_tenant,
   }
-  keystone_role { ['admin', '_member_']:
+  keystone_role { 'admin':
     ensure => present,
   }
   keystone_user_role { "${admin}@${admin_tenant}":

spec/classes/keystone_roles_admin_spec.rb

@@ -29,9 +29,7 @@
       :password               => 'ChangeMe',
       :ignore_default_tenant  => 'false'
     )}
-    ['admin', '_member_'].each do |role_name|
-      it { should contain_keystone_role(role_name).with_ensure('present') }
-    end
+    it { should contain_keystone_role('admin').with_ensure('present') }
     it { should contain_keystone_user_role('admin@openstack').with(
       :roles  => 'admin',
       :ensure => 'present'