openstack/openstack-ansible-os_swift
Code Issues Proposed changes

Merge "Always setup ResellerAdmin role in keystone"

Browse Source
This commit is contained in:
Jenkins 2016-10-16 11:14:30 +00:00 committed by Gerrit Code Review
commit 6e816d8f37
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tasks/swift_service_setup.yml
View File

@ -104,13 +104,12 @@
login_user: "{{ keystone_admin_user_name }}" login_user: "{{ keystone_admin_user_name }}"
login_password: "{{ keystone_auth_admin_password }}" login_password: "{{ keystone_auth_admin_password }}"
login_project_name: "{{ keystone_admin_tenant_name }}" login_project_name: "{{ keystone_admin_tenant_name }}"
role_name: "ResellerAdmin" role_name: "{{ swift_reselleradmin_role }}"
insecure: "{{ keystone_service_adminuri_insecure }}" insecure: "{{ keystone_service_adminuri_insecure }}"
register: add_role register: add_role
until: add_role|success until: add_role|success
retries: 5 retries: 5
delay: 10 delay: 10
when: swift_ceilometer_enabled | bool
- name: "Add ResellerAdmin role to the service tenant and ceilometer user" - name: "Add ResellerAdmin role to the service tenant and ceilometer user"
keystone: keystone:

1
tests/test-swift-functional.yml
View File

@ -35,7 +35,6 @@
role_name: "{{ item }}" role_name: "{{ item }}"
insecure: "{{ keystone_service_adminuri_insecure }}" insecure: "{{ keystone_service_adminuri_insecure }}"
with_items: with_items:
- "ResellerAdmin"
- "test-role" - "test-role"
- "test5" - "test5"
run_once: true run_once: true