From 1804ec25cb212be53c48780ef0385ea0e91522b9 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <kajinamit@oss.nttdata.com>
Date: Wed, 24 Jul 2024 00:52:45 +0900
Subject: [PATCH] Replace _member_ role by member role

The member role is now commonly used as one of the default roles
created during bootstrap. Replace the legacy _member_ role by it.

Change-Id: I5d2404e16cce69f1897e3b3e5714e43ab24b7ed1
---
 packstack/puppet/modules/packstack/manifests/horizon.pp  | 1 -
 packstack/puppet/modules/packstack/manifests/keystone.pp | 9 +--------
 .../puppet/modules/packstack/manifests/provision.pp      | 2 +-
 .../puppet/modules/packstack/manifests/swift/proxy.pp    | 2 +-
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/packstack/puppet/modules/packstack/manifests/horizon.pp b/packstack/puppet/modules/packstack/manifests/horizon.pp
index a58c033c6..604380d6f 100644
--- a/packstack/puppet/modules/packstack/manifests/horizon.pp
+++ b/packstack/puppet/modules/packstack/manifests/horizon.pp
@@ -19,7 +19,6 @@ class packstack::horizon ()
     class { 'horizon':
       secret_key            => lookup('CONFIG_HORIZON_SECRET_KEY'),
       keystone_url          => lookup('CONFIG_KEYSTONE_PUBLIC_URL'),
-      keystone_default_role => '_member_',
       server_aliases        => [lookup('CONFIG_CONTROLLER_HOST'), $facts['networking']['fqdn'], 'localhost'],
       allowed_hosts         => '*',
       hypervisor_options    => {'can_set_mount_point' => false, },
diff --git a/packstack/puppet/modules/packstack/manifests/keystone.pp b/packstack/puppet/modules/packstack/manifests/keystone.pp
index 7d92cddc0..04a9810a2 100644
--- a/packstack/puppet/modules/packstack/manifests/keystone.pp
+++ b/packstack/puppet/modules/packstack/manifests/keystone.pp
@@ -46,16 +46,9 @@ class packstack::keystone ()
       ssl     => $keystone_use_ssl
     }
 
-    $username = lookup('CONFIG_KEYSTONE_ADMIN_USERNAME')
-
-    # Ensure the default _member_ role is present
-    keystone_role { '_member_':
-      ensure => present,
-    }
-
     class { 'keystone::bootstrap':
       password     => lookup('CONFIG_KEYSTONE_ADMIN_PW'),
-      username     => $username,
+      username     => lookup('CONFIG_KEYSTONE_ADMIN_USERNAME'),
       email        => lookup('CONFIG_KEYSTONE_ADMIN_EMAIL'),
       project_name => 'admin',
       role_name    => 'admin',
diff --git a/packstack/puppet/modules/packstack/manifests/provision.pp b/packstack/puppet/modules/packstack/manifests/provision.pp
index f354007eb..fda848129 100644
--- a/packstack/puppet/modules/packstack/manifests/provision.pp
+++ b/packstack/puppet/modules/packstack/manifests/provision.pp
@@ -41,7 +41,7 @@ class packstack::provision ()
 
       keystone_user_role { "${username}@${project_name}":
         ensure => present,
-        roles  => ['_member_'],
+        roles  => ['member'],
       }
 
       ## Neutron
diff --git a/packstack/puppet/modules/packstack/manifests/swift/proxy.pp b/packstack/puppet/modules/packstack/manifests/swift/proxy.pp
index cb66e0a85..681a00806 100644
--- a/packstack/puppet/modules/packstack/manifests/swift/proxy.pp
+++ b/packstack/puppet/modules/packstack/manifests/swift/proxy.pp
@@ -106,7 +106,7 @@ class packstack::swift::proxy ()
     }
 
     class { 'swift::proxy::keystone':
-      operator_roles => ['admin', 'SwiftOperator', '_member_'],
+      operator_roles => ['admin', 'SwiftOperator', 'member'],
     }
 
     class { 'swift::proxy::authtoken':