Skip to content

Commit d3b6b63

Browse files
authored
Merge pull request #43 from stackhpc/fix/rbac-info-prefix
Remove openstack_ prefix from info objects in RBAC tasks
2 parents 8eabd34 + 9d2e56e commit d3b6b63

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

roles/os_networks/tasks/rbac.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
- name: Frobnicate to inject project ID
1616
ansible.builtin.set_fact:
17-
os_networks_rbac_with_id: "{{ os_networks_rbac_with_id + [item | combine({'network_id': os_networks_admin_networks.openstack_networks | selectattr('name', 'equalto',
17+
os_networks_rbac_with_id: "{{ os_networks_rbac_with_id + [item | combine({'network_id': os_networks_admin_networks.networks | selectattr('name', 'equalto',
1818
item['network']) | map(attribute='id') | first})] }}"
1919
with_items: "{{ os_networks_rbac }}"
2020
vars:
@@ -34,7 +34,7 @@
3434

3535
- name: Set admin project ID
3636
ansible.builtin.set_fact:
37-
admin_project_id: "{{ admin_project_data.openstack_projects | map(attribute='id') | first }}"
37+
admin_project_id: "{{ admin_project_data.projects | map(attribute='id') | first }}"
3838

3939
# Retrieve project IDs of other OpenStack projects
4040
- name: Lookup OpenStack project IDs
@@ -66,5 +66,5 @@
6666
object_id: "{{ item[0].network_id }}"
6767
object_type: network
6868
project_id: "{{ admin_project_id }}"
69-
target_project_id: "{{ project_data.openstack_projects | selectattr('name', 'equalto', item[1]) | map(attribute='id') | first }}"
69+
target_project_id: "{{ project_data.projects | selectattr('name', 'equalto', item[1]) | map(attribute='id') | first }}"
7070
loop: "{{ os_networks_rbac_expanded }}"

0 commit comments

Comments
 (0)