Merge "Remove "ResellerAdmin" role assignment for ceilometer"

devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/build_srpm.data

@@ -1 +1 @@
-TIS_PATCH_VER=2
+TIS_PATCH_VER=3

devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/meta_patches/0004-meta-remove-reseller-admin-role.patch

@@ -0,0 +1,32 @@
+From 5593efe4967eb528da3e7acbd6e693f6a5b0f7c5 Mon Sep 17 00:00:00 2001
+From: Angie Wang <Angie.Wang@windriver.com>
+Date: Tue, 17 Apr 2018 13:15:49 -0400
+Subject: [PATCH 1/1] meta remove reseller admin role
+
+---
+ SPECS/puppet-ceilometer.spec | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/SPECS/puppet-ceilometer.spec b/SPECS/puppet-ceilometer.spec
+index 5356f91..9f291f9 100644
+--- a/SPECS/puppet-ceilometer.spec
++++ b/SPECS/puppet-ceilometer.spec
+@@ -11,6 +11,7 @@ Source0:        https://tarballs.openstack.org/%{name}/%{name}-%{upstream_versio
+ 
+ Patch0001:      0001-Roll-up-TIS-patches.patch
+ Patch0002:      0002-Fix-ceilometer-puppet-warnings.patch
++Patch0003:      0003-remove-reseller-admin-role.patch
+ 
+ BuildArch:      noarch
+ 
+@@ -29,6 +30,7 @@ Puppet module for OpenStack Ceilometer
+ %setup -q -n openstack-ceilometer-%{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-ceilometer-11.3.0/centos/meta_patches/PATCH_ORDER

@@ -1,3 +1,4 @@
 0001-Update-package-versioning-for-TIS-format.patch
 0002-Add-Rebase-Patches.patch
 0003-meta-fix-ceilometer-puppet-warnings.patch
+0004-meta-remove-reseller-admin-role.patch

devtools/puppet-modules/openstack/puppet-ceilometer-11.3.0/centos/patches/0003-remove-reseller-admin-role.patch

@@ -0,0 +1,37 @@
+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
+