1 From 0fb9013aa056db642457e93a20499fd9b46ba436 Mon Sep 17 00:00:00 2001
2 From: Kam Nasim <kam.nasim@windriver.com>
3 Date: Mon, 22 Jan 2018 11:18:08 -0500
4 Subject: [PATCH] CGTS-8701: Remove the Keystone-admin app
6 Following the Pike rebase, no services are using Identity V2 and
7 therefore we can shut off the Keystone admin port / app, as in Identity
8 V3 the public endpoint and admin endpoints both offer identical services
10 lib/puppet/provider/keystone.rb | 6 +++++-
11 1 file changed, 5 insertions(+), 1 deletion(-)
13 diff --git a/lib/puppet/provider/keystone.rb b/lib/puppet/provider/keystone.rb
14 index 8eb171d..3c310dc 100644
15 --- a/lib/puppet/provider/keystone.rb
16 +++ b/lib/puppet/provider/keystone.rb
17 @@ -171,12 +171,16 @@ class Puppet::Provider::Keystone < Puppet::Provider::Openstack
20 def self.get_admin_endpoint
21 + # NOTE (knasim-wrs): As of the Pike rebase, the public port(5000)
22 + # provides the same functionality as the admin port(35357). We
23 + # shall therefore not deploy the keystone-admin app and return
27 if url = get_section('DEFAULT', 'admin_endpoint')
28 endpoint = url.chomp('/')
30 - admin_port = get_section('DEFAULT', 'admin_port') || '35357'
31 + admin_port = get_section('DEFAULT', 'public_port') || '5000'
32 host = clean_host(get_section('DEFAULT', 'admin_bind_host'))
33 protocol = ssl? ? 'https' : 'http'
34 endpoint = "#{protocol}://#{host}:#{admin_port}"