X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;ds=inline;f=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-keystone%2F0002-remove-the-Keystone-admin-app.patch;fp=meta-stx%2Frecipes-support%2Fpuppet%2Ffiles%2Fpuppet-keystone%2F0002-remove-the-Keystone-admin-app.patch;h=7499a8c8046e4686eb3c0f384c7a39303f90b5db;hb=57fdea704bd62af847872c40508f00aa1d7cac60;hp=0000000000000000000000000000000000000000;hpb=f23f21bccfb750b9e30141fd9676515215ffbc4e;p=pti%2Frtp.git

diff --git a/meta-stx/recipes-support/puppet/files/puppet-keystone/0002-remove-the-Keystone-admin-app.patch b/meta-stx/recipes-support/puppet/files/puppet-keystone/0002-remove-the-Keystone-admin-app.patch
new file mode 100644
index 0000000..7499a8c
--- /dev/null
+++ b/meta-stx/recipes-support/puppet/files/puppet-keystone/0002-remove-the-Keystone-admin-app.patch
@@ -0,0 +1,37 @@
+From 0fb9013aa056db642457e93a20499fd9b46ba436 Mon Sep 17 00:00:00 2001
+From: Kam Nasim <kam.nasim@windriver.com>
+Date: Mon, 22 Jan 2018 11:18:08 -0500
+Subject: [PATCH] CGTS-8701: Remove the Keystone-admin app
+
+Following the Pike rebase, no services are using Identity V2 and
+therefore we can shut off the Keystone admin port / app, as in Identity
+V3 the public endpoint and admin endpoints both offer identical services
+---
+ lib/puppet/provider/keystone.rb | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb
+index 8eb171d..3c310dc 100644
+--- a/lib/puppet/provider/keystone.rb
++++ b/lib/puppet/provider/keystone.rb
+@@ -171,12 +171,16 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
+   end
+ 
+   def self.get_admin_endpoint
++    # NOTE (knasim-wrs): As of the Pike rebase, the public port(5000)
++    # provides the same functionality as the admin port(35357). We
++    # shall therefore not deploy the keystone-admin app and return
++    # the public port
+     endpoint = nil
+     if keystone_file
+       if url = get_section('DEFAULT', 'admin_endpoint')
+         endpoint = url.chomp('/')
+       else
+-        admin_port = get_section('DEFAULT', 'admin_port') || '35357'
++        admin_port = get_section('DEFAULT', 'public_port') || '5000'
+         host = clean_host(get_section('DEFAULT', 'admin_bind_host'))
+         protocol = ssl? ? 'https' : 'http'
+         endpoint = "#{protocol}://#{host}:#{admin_port}"
+-- 
+1.8.3.1
+