bab9bb6b69
Create new directories:
ceph
config
config-files
filesystem
kernel
kernel/kernel-modules
ldap
logging
strorage-drivers
tools
utilities
virt
Retire directories:
connectivity
core
devtools
support
extended
Delete two packages:
tgt
irqbalance
Relocated packages:
base/
dhcp
initscripts
libevent
lighttpd
linuxptp
memcached
net-snmp
novnc
ntp
openssh
pam
procps
sanlock
shadow
sudo
systemd
util-linux
vim
watchdog
ceph/
python-cephclient
config/
facter
puppet-4.8.2
puppet-modules
filesystem/
e2fsprogs
nfs-utils
nfscheck
kernel/
kernel-std
kernel-rt
kernel/kernel-modules/
mlnx-ofa_kernel
ldap/
nss-pam-ldapd
openldap
logging/
syslog-ng
logrotate
networking/
lldpd
iproute
mellanox
python-ryu
mlx4-config
python/
python-2.7.5
python-django
python-gunicorn
python-setuptools
python-smartpm
python-voluptuous
security/
shim-signed
shim-unsigned
tboot
strorage-drivers/
python-3parclient
python-lefthandclient
virt/
cloud-init
libvirt
libvirt-python
qemu
tools/
storage-topology
vm-topology
utilities/
tis-extensions
namespace-utils
nova-utils
update-motd
Change-Id: I37ade764d873c701b35eac5881eb40412ba64a86
Story: 2002801
Task: 22687
Signed-off-by: Scott Little <scott.little@windriver.com>
52 lines
1.9 KiB
Diff
52 lines
1.9 KiB
Diff
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
|
|
|