starlingx
/
integ
Code Issues Proposed changes

Debian: Fix openstack secret get failure 

Correct the required exec resource title for updating DC keystone
admin user/project IDs section.

The exec resource title was renamed from "keystone-manage bootstrap"
to "keystone bootstrap" in Debian. Update this patch accordingly.

Test Plan:
Verified: successfully get openstack secrets after DC installation
          and Subcloud managed on Debian.

Story: 2010119
Task: 46218

Signed-off-by: lzhu1 <li.zhu@windriver.com>
Change-Id: I5dd9f06436903a01b564f44004058438a93de8b6
This commit is contained in:
lzhu1 2022-09-07 20:06:01 +00:00 committed by Li Zhu
parent 2c71642e6e
commit 13568d6acc
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
config/puppet-modules/openstack/puppet-keystone-17.4.0/debian/patches/0003-Update-Barbican-admin-secret-s-user-project-IDs-duri.patch
View File

@ -1,7 +1,7 @@
From da6335eee107386e555097522152fcbb335c608c Mon Sep 17 00:00:00 2001 From 127b8a6d5b8845a25044f3000a8a14d032546135 Mon Sep 17 00:00:00 2001
From: Dan Voiculeasa <dan.voiculeasa@windriver.com> From: Dan Voiculeasa <dan.voiculeasa@windriver.com>
Date: Mon, 20 Sep 2021 17:25:11 +0300 Date: Mon, 20 Sep 2021 17:25:11 +0300
Subject: [PATCH 3/3] Update Barbican admin secret's user/project IDs during Subject: [PATCH] Update Barbican admin secret's user/project IDs during
bootstrap bootstrap
Adapt 0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch Adapt 0006-update-Barbican-admin-secret-s-user-project-IDs-duri.patch
@ -36,7 +36,7 @@ Signed-off-by: Dan Voiculeasa <dan.voiculeasa@windriver.com>
1 file changed, 18 insertions(+) 1 file changed, 18 insertions(+)
diff --git a/manifests/bootstrap.pp b/manifests/bootstrap.pp diff --git a/manifests/bootstrap.pp b/manifests/bootstrap.pp
index d8db334..6d79625 100644 index d8db334..8a2feea 100644
--- a/manifests/bootstrap.pp --- a/manifests/bootstrap.pp
+++ b/manifests/bootstrap.pp +++ b/manifests/bootstrap.pp
@@ -69,6 +69,8 @@ class keystone::bootstrap ( @@ -69,6 +69,8 @@ class keystone::bootstrap (
@ -55,7 +55,7 @@ index d8db334..6d79625 100644
+ if $dc_admin_user_id and $dc_admin_project_id { + if $dc_admin_user_id and $dc_admin_project_id {
+ exec { 'update keystone admin assignment actor_id': + exec { 'update keystone admin assignment actor_id':
+ command => "sudo -u postgres psql -d keystone -c \"update public.assignment set actor_id='$dc_admin_user_id' from public.local_user where public.assignment.actor_id=public.local_user.user_id and public.local_user.name='admin'\"", + command => "sudo -u postgres psql -d keystone -c \"update public.assignment set actor_id='$dc_admin_user_id' from public.local_user where public.assignment.actor_id=public.local_user.user_id and public.local_user.name='admin'\"",
+ require => Exec['keystone-manage bootstrap'], + require => Exec['keystone bootstrap'],
+ } + }
+ -> exec { 'update keystone admin assignment target_id': + -> exec { 'update keystone admin assignment target_id':
+ command => "sudo -u postgres psql -d keystone -c \"update public.assignment set target_id='$dc_admin_project_id' from public.project where public.assignment.target_id=public.project.id and public.project.name='admin'\"", + command => "sudo -u postgres psql -d keystone -c \"update public.assignment set target_id='$dc_admin_project_id' from public.project where public.assignment.target_id=public.project.id and public.project.name='admin'\"",
@ -72,5 +72,5 @@ index d8db334..6d79625 100644
# use the below resources to make sure the current resources are # use the below resources to make sure the current resources are
# correct so if some value was updated we set that. # correct so if some value was updated we set that.
-- --
2.30.0 2.34.1