starlingx
/
integ
Code Issues Proposed changes

Add keystone region name to systemcontroller 

This is part of feature Distributed Keystone for Distributed Cloud

Story: 2002842
Task: 22785

Change-Id: I234aa80dc2a4bc9693ffa5faa3eb6873ac0640b4
Signed-off-by: Jack Ding <jack.ding@windriver.com>
This commit is contained in:
Kam Nasim 2018-05-22 17:40:51 -04:00 committed by Jack Ding
parent d3e6c4efe0
commit f6ae4728a5
3 changed files with 51 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/0004-distributed-keystone-in-system-controller.patch Normal file
View File

@ -0,0 +1,32 @@
From fc863dbafa9014e6ea48b94cc9dcfa4e939245d8 Mon Sep 17 00:00:00 2001
From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 11 May 2018 11:02:49 -0400
Subject: [PATCH] Add region name for distributed keystone in system controller
---
SPECS/puppet-openstacklib.spec | 2 ++
1 file changed, 2 insertions(+)
diff --git a/SPECS/puppet-openstacklib.spec b/SPECS/puppet-openstacklib.spec
index 1a42722..399712f 100644
--- a/SPECS/puppet-openstacklib.spec
+++ b/SPECS/puppet-openstacklib.spec
@@ -10,6 +10,7 @@ URL: https://launchpad.net/puppet-openstacklib
Source0: https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
Patch0001: 0001-Roll-up-TIS-patches.patch
Patch0002: 0002-Add-os-region-name-option-for-system-controller.patch
+Patch0003: 0003-distributed-keystone-for-system-controller.patch
BuildArch: noarch
@@ -28,6 +29,7 @@ Puppet OpenStack Libraries
%setup -q -n openstack-openstacklib-%{upstream_version}
%patch0001 -p1
%patch0002 -p1
+%patch0003 -p1
find . -type f -name ".*" -exec rm {} +
find . -size 0 -exec rm {} +
--
1.8.3.1

1
devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/meta_patches/PATCH_ORDER
View File

@ -1,3 +1,4 @@
0001-Update-package-versioning-for-TIS-format.patch
0002-Add-TIS-patch.patch
0003-Add-os-region-name-option-for-system-controller.patch
0004-distributed-keystone-in-system-controller.patch

18
devtools/puppet-modules/openstack/puppet-openstacklib-11.3.0/centos/patches/0003-distributed-keystone-for-system-controller.patch Normal file
View File

@ -0,0 +1,18 @@
From: Kam Nasim <kam.nasim@windriver.com>
Date: Fri, 11 May 2018 11:35:59 -0600
Subject: [PATCH 1/1] Add Distributed Keystone region name option for system controller
---
lib/puppet/provider/openstack.rb | 1 +
1 file changed, 1 insertion(+)
--- a/lib/puppet/provider/openstack.rb
+++ b/lib/puppet/provider/openstack.rb
@@ -55,6 +55,7 @@ class Puppet::Provider::Openstack < Pupp
Timeout.timeout(command_timeout(action)) do
args.unshift('--os-interface', 'internal')
if systemcontroller?
+ args.unshift('--os-keystone-region-name', 'RegionOne')
args.unshift('--os-region-name', 'SystemController')
end
openstack_command *args