openstack/cookbook-openstack-identity
Code Issues Proposed changes

Remove unnecessary monitoring user

Browse Source 
Recent commit e3db2693b50d9d950adc6119135403eb235335ab created the
'ceilometer' user. A 'monitoring' user is left over and being created
but it isn't being used. This patch removes it.

Change-Id: I503b7e3d2d6484126f8e798a36fb47f6f717e17a
Closes-Bug: #1285352
This commit is contained in:
Luis A. Garcia
2014-03-13 00:10:11 +00:00
parent 289266f171
commit 2b749c7692
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
attributes/default.rb
View File

@@ -60,10 +60,6 @@ default['openstack']['identity']['users'] = {
'KeystoneAdmin' => ['admin'],
'KeystoneServiceAdmin' => ['admin']
}
},
'monitoring' => {
'default_tenant' => 'service',
'roles' => { 'Member' => ['admin'] }
}
}

7
spec/registration_spec.rb
View File

@@ -25,7 +25,7 @@ describe 'openstack-identity::registration' do
describe 'tenant registration' do
context 'default tenants' do
['admin', 'service'].each do |tenant_name|
['admin'].each do |tenant_name|
it "registers the #{tenant_name} tenant" do
expect(chef_run).to create_tenant_openstack_identity_register(
"Register '#{tenant_name}' Tenant"
@@ -58,7 +58,7 @@ describe 'openstack-identity::registration' do
describe 'role registration' do
context 'default roles' do
%w{admin Member KeystoneAdmin KeystoneServiceAdmin}.each do |role_name|
%w{admin KeystoneAdmin KeystoneServiceAdmin}.each do |role_name|
it "registers the #{role_name} role" do
expect(chef_run).to create_role_openstack_identity_register(
"Register '#{role_name}' Role"
@@ -90,13 +90,12 @@ describe 'openstack-identity::registration' do
describe 'user registration' do
context 'default users' do
user_monit = ['monitoring', 'service', ['Member']]
user_admin = [
'admin', 'admin',
['admin', 'KeystoneAdmin', 'KeystoneServiceAdmin']
]
[user_monit, user_admin].each do |user, tenant, roles|
[user_admin].each do |user, tenant, roles|
context "#{user} user" do
it "registers the #{user} user" do
expect(chef_run).to create_user_openstack_identity_register(