Add username/password auth to glance api

This is part of Distributed Cloud keystone scalability.

Story: 2002842
Task: 22785

Change-Id: Ib94930fdd2c096054d54c2d7f0b2a523127ec451
Signed-off-by: Andy Ning <andy.ning@windriver.com>
Signed-off-by: Don Penney <don.penney@windriver.com>
Signed-off-by: Jack Ding <jack.ding@windriver.com>

devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/0004-add-username-password-authentication-support-to-api.patch

@@ -0,0 +1,32 @@
+From 292ba3e769183377dfccc012e979ddbc53fc0356 Mon Sep 17 00:00:00 2001
+From: Andy Ning <andy.ning@windriver.com>
+Date: Tue, 12 Jun 2018 09:19:40 -0400
+Subject: [PATCH 1/1] add username and password authentication support to api
+
+---
+ SPECS/puppet-glance.spec | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/SPECS/puppet-glance.spec b/SPECS/puppet-glance.spec
+index 1e49ae0..5bb536f 100644
+--- a/SPECS/puppet-glance.spec
++++ b/SPECS/puppet-glance.spec
+@@ -10,6 +10,7 @@ URL:            https://launchpad.net/puppet-glance
+ Source0:        https://tarballs.openstack.org/%{name}/%{name}-%{upstream_version}.tar.gz
+ Patch0001:      0001-Roll-up-TIS-patches.patch
+ Patch0002:      0002-Add-region-cache-support.patch
++Patch0003:      0003-add-username-password-authentication-support-to-api.patch
+ 
+ BuildArch:      noarch
+ 
+@@ -27,6 +28,7 @@ Puppet module for OpenStack Glance
+ %setup -q -n openstack-glance-%{upstream_version}
+ %patch0001 -p1
+ %patch0002 -p1
++%patch0003 -p1
+ 
+ find . -type f -name ".*" -exec rm {} +
+ find . -size 0 -exec rm {} +
+-- 
+1.8.3.1
+

devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/meta_patches/PATCH_ORDER

@@ -1,3 +1,4 @@
 0001-Update-package-versioning-for-TIS-format.patch
 0002-Add-TIS-patch.patch
 0003-Add-region-cache-support.patch
+0004-add-username-password-authentication-support-to-api.patch

devtools/puppet-modules/openstack/puppet-glance-11.3.0/centos/patches/0003-add-username-password-authentication-support-to-api.patch

@@ -0,0 +1,51 @@
+From e87af6de1e474fc26c74eafaef2671b006f9b81b Mon Sep 17 00:00:00 2001
+From: Andy Ning <andy.ning@windriver.com>
+Date: Tue, 12 Jun 2018 09:05:27 -0400
+Subject: [PATCH 1/1] add username and password authentication support to api
+
+---
+ manifests/api.pp | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/manifests/api.pp b/manifests/api.pp
+index e563556..95230ee 100644
+--- a/manifests/api.pp
++++ b/manifests/api.pp
+@@ -374,6 +374,14 @@ class glance::api(
+   $data_api                 = 'glance.db.sqlalchemy.api',
+   # DEPRECATED PARAMETERS
+   $known_stores                         = false,
++  # add glance API options for distributed keystone
++  $use_user_token                       = true,
++  $admin_user                           = 'admin',
++  $admin_tenant_name                    = 'admin',
++  $admin_password                       = '!!',
++  $auth_url                             = undef,
++  $api_auth_strategy                    = 'keystone',
++  $auth_region                          = 'RegionOne',
+ ) inherits glance {
+ 
+   include ::glance::deps
+@@ -546,6 +554,19 @@ class glance::api(
+     'DEFAULT/registry_client_key_file':  value => $registry_client_key_file;
+   }
+ 
++  # add glanc API options for distributed keystone
++  if !$use_user_token { 
++    glance_api_config {
++      'DEFAULT/use_user_token':            value => $use_user_token;
++      'DEFAULT/admin_user':                value => $admin_user;
++      'DEFAULT/admin_tenant_name':         value => $admin_tenant_name; 
++      'DEFAULT/admin_password':            value => $admin_password;
++      'DEFAULT/auth_url':                  value => $auth_url;
++      'DEFAULT/auth_strategy':             value => $api_auth_strategy;
++      'DEFAULT/auth_region':               value => $auth_region;
++    }
++  }
++
+   if $manage_service {
+     if $enabled {
+       $service_ensure = 'running'
+-- 
+1.8.3.1
+