![Scott Little](/assets/img/avatar_default.png)
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>
38 lines
1.1 KiB
Diff
38 lines
1.1 KiB
Diff
From f257ef739b3d2593ed4613f9661f97d0228188bd Mon Sep 17 00:00:00 2001
|
|
From: Angie Wang <Angie.Wang@windriver.com>
|
|
Date: Tue, 17 Apr 2018 11:54:19 -0400
|
|
Subject: [PATCH 1/1] remove reseller admin role
|
|
|
|
---
|
|
manifests/keystone/auth.pp | 10 ----------
|
|
1 file changed, 10 deletions(-)
|
|
|
|
diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp
|
|
index a9abe8c..1aa91ad 100644
|
|
--- a/manifests/keystone/auth.pp
|
|
+++ b/manifests/keystone/auth.pp
|
|
@@ -103,20 +103,10 @@ class ceilometer::keystone::auth (
|
|
password => $password,
|
|
email => $email,
|
|
tenant => $tenant,
|
|
- roles => ['admin', 'ResellerAdmin'],
|
|
public_url => $public_url,
|
|
admin_url => $admin_url,
|
|
internal_url => $internal_url,
|
|
}
|
|
|
|
- if $configure_user_role {
|
|
- if !defined(Keystone_role['ResellerAdmin']) {
|
|
- keystone_role { 'ResellerAdmin':
|
|
- ensure => present,
|
|
- }
|
|
- }
|
|
- Keystone_role['ResellerAdmin'] -> Keystone_user_role["${auth_name}@${tenant}"]
|
|
- }
|
|
-
|
|
}
|
|
|
|
--
|
|
1.8.3.1
|
|
|