Browse Source

Merge "Use new "service" role instead of "admin""

tags/kilo-eol
Jenkins 4 years ago
parent
commit
440f32f4fb
2 changed files with 3 additions and 3 deletions
  1. 1
    1
      attributes/default.rb
  2. 2
    2
      spec/identity_registration_spec.rb

+ 1
- 1
attributes/default.rb View File

@@ -128,7 +128,7 @@ end
128 128
 
129 129
 default['openstack']['block-storage']['service_tenant_name'] = 'service'
130 130
 default['openstack']['block-storage']['service_user'] = 'cinder'
131
-default['openstack']['block-storage']['service_role'] = 'admin'
131
+default['openstack']['block-storage']['service_role'] = 'service'
132 132
 
133 133
 # SAN Support
134 134
 default['openstack']['block-storage']['san']['san_ip'] = '127.0.0.1'

+ 2
- 2
spec/identity_registration_spec.rb View File

@@ -173,7 +173,7 @@ describe 'openstack-block-storage::identity_registration' do
173 173
       )
174 174
     end
175 175
 
176
-    it 'grants admin role to service user for service tenant' do
176
+    it 'grants service role to service user for service tenant' do
177 177
       expect(chef_run).to grant_role_openstack_identity_register(
178 178
         'Grant service Role to Cinder Service User for Cinder Service Tenant'
179 179
       ).with(
@@ -181,7 +181,7 @@ describe 'openstack-block-storage::identity_registration' do
181 181
         bootstrap_token: 'bootstrap-token',
182 182
         tenant_name: 'service',
183 183
         user_name: 'cinder',
184
-        role_name: 'admin'
184
+        role_name: 'service'
185 185
       )
186 186
     end
187 187
   end

Loading…
Cancel
Save