openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix create and associate error of resellerAdmin"

Browse Source
This commit is contained in:
Jenkins 2017-05-17 10:35:02 +00:00 committed by Gerrit Code Review
commit b264647a2e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/ceilometer/tasks/register.yml
View File

@ -42,5 +42,7 @@
role: "ResellerAdmin" role: "ResellerAdmin"
region_name: "{{ openstack_region_name }}" region_name: "{{ openstack_region_name }}"
auth: "{{ '{{ openstack_ceilometer_auth }}' }}" auth: "{{ '{{ openstack_ceilometer_auth }}' }}"
module_extra_vars:
openstack_ceilometer_auth: "{{ openstack_ceilometer_auth }}"
when: enable_swift | bool when: enable_swift | bool
run_once: True run_once: True

5
ansible/roles/swift/tasks/register.yml
View File

@ -37,9 +37,10 @@
kolla_toolbox: kolla_toolbox:
module_name: "os_keystone_role" module_name: "os_keystone_role"
module_args: module_args:
project: "service" name: "ResellerAdmin"
role: "ResellerAdmin"
region_name: "{{ openstack_region_name }}" region_name: "{{ openstack_region_name }}"
auth: "{{ '{{ openstack_swift_auth }}' }}" auth: "{{ '{{ openstack_swift_auth }}' }}"
module_extra_vars:
openstack_swift_auth: "{{ openstack_swift_auth }}"
when: enable_ceilometer | bool when: enable_ceilometer | bool
run_once: True run_once: True