From 87b39c553db0340f55892255d84ee752d6b4cf19 Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Thu, 15 Jul 2021 20:56:44 -0500
Subject: [PATCH] Remove member bootstrap logic
As of Rocky, keystone creates the member role by default. Since
our removal of pre-Train support, the logic we have in the
bootstrap script is no longer needed.
This change removes the member user and role logic.
Change-Id: Ide3af5c47c6b45c013b4dee08076d11bcfe87c53
---
keystone/Chart.yaml | 2 +-
keystone/values.yaml | 8 --------
releasenotes/notes/keystone.yaml | 1 +
3 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/keystone/Chart.yaml b/keystone/Chart.yaml
index e20d3bdb2c..44eeb84245 100644
--- a/keystone/Chart.yaml
+++ b/keystone/Chart.yaml
@@ -14,7 +14,7 @@ apiVersion: v1
appVersion: v1.0.0
description: OpenStack-Helm Keystone
name: keystone
-version: 0.2.7
+version: 0.2.8
home: https://docs.openstack.org/keystone/latest/
icon: https://www.openstack.org/themes/openstack/images/project-mascots/Keystone/OpenStack_Project_Keystone_vertical.png
sources:
diff --git a/keystone/values.yaml b/keystone/values.yaml
index 92e97b3d3f..35025e2101 100644
--- a/keystone/values.yaml
+++ b/keystone/values.yaml
@@ -62,14 +62,6 @@ bootstrap:
enabled: true
ks_user: admin
script: |
- #NOTE(gagehugo): As of Rocky, keystone creates a member role by default
- openstack role create --or-show member
- openstack role add \
- --user="${OS_USERNAME}" \
- --user-domain="${OS_USER_DOMAIN_NAME}" \
- --project-domain="${OS_PROJECT_DOMAIN_NAME}" \
- --project="${OS_PROJECT_NAME}" \
- "member"
# admin needs the admin role for the default domain
openstack role add \
--user="${OS_USERNAME}" \
diff --git a/releasenotes/notes/keystone.yaml b/releasenotes/notes/keystone.yaml
index e2d25bd280..9478abc0fc 100644
--- a/releasenotes/notes/keystone.yaml
+++ b/releasenotes/notes/keystone.yaml
@@ -23,4 +23,5 @@ keystone:
- 0.2.5 Mount rabbitmq TLS secret
- 0.2.6 Modify default probe timings
- 0.2.7 Add Ussuri release support
+ - 0.2.8 Remove member bootstrap logic
...