meta-stx/recipes-support/puppet/files/puppet-keystone/0003-remove-eventlet_bindhost-from-Keystoneconf.patch

   1 commit bb91ab26622a5ec695c6564af5a9e5e54fdc903c
   2 Author: Shoaib Nasir <shoaib.nasir@windriver.com>
   3 Date:   Thu Feb 15 15:04:55 2018 -0500
   4
   5     WRS: Patch3: 0003-remove-eventlet_bindhost-from-Keystoneconf.patch
   6
   7 diff --git a/manifests/init.pp b/manifests/init.pp
   8 index 4d79d30..d64638c 100644
   9 --- a/manifests/init.pp
  10 +++ b/manifests/init.pp
  11 @@ -871,8 +871,9 @@ admin_token will be removed in a later release")
  12      # WRS: the following options are deprecated for removal
  13      # however public_bind_host and admin_bind_host are still required as long as
  14      # keystone is running under eventlet
  15 -    'DEFAULT/public_bind_host': value => $public_bind_host;
  16 -    'DEFAULT/admin_bind_host':  value => $admin_bind_host;
  17 +    # WRS: bind_host options removed from keystone.conf [DEFAULT]
  18 +    #'DEFAULT/public_bind_host': value => $public_bind_host;
  19 +    #'DEFAULT/admin_bind_host':  value => $admin_bind_host;
  20      #'DEFAULT/public_port':      value => $public_port;
  21      #'DEFAULT/admin_port':       value => $admin_port;
  22      'DEFAULT/member_role_id':   value => $member_role_id;
  23 @@ -1110,10 +1111,12 @@ Fernet or UUID tokens are recommended.")
  24    # WRS: The following options are deprecated for removal
  25    # however they are still required as long as keystone
  26    # is running under eventlet
  27 -  keystone_config {
  28 -    'eventlet_server/admin_workers':  value => $admin_workers;
  29 -    'eventlet_server/public_workers': value => $public_workers;
  30 -  }
  31 +  # WRS(snasir): Removing these options from keystone.conf
  32 +  # since they are now populated in keystone-api.conf
  33 +  #keystone_config {
  34 +  #  'eventlet_server/admin_workers':  value => $admin_workers;
  35 +  #  'eventlet_server/public_workers': value => $public_workers;
  36 +  #}
  37
  38    if $manage_service {
  39      if $enabled {