Merge branch 'main' into debootstrap

Author: Alex-Welsh

roles/os_flavors/README.md

@@ -32,9 +32,9 @@ may contain 'ephemeral', 'flavorid', 'rxtx_factor' and 'swap' items.
 Optionally, the dict may also contain an item 'extra_specs', which is a dict of
 metadata to attach to the flavor object.
 
-`is_public` default is `true`. It is a mandatory parameter when mapping flavor
-to project, and it have to be set to `false` in that case. Non public 
-flavor can't be mapped.  However there is possibility to create flavor which 
+`is_public` default is `true`. It is a mandatory parameter when mapping
+flavor to project, and it have to be set to `false` in that case. Public 
+flavor can't be mapped. However there is possibility to create flavor which 
 is private and not mapped to any project. Only 'true' and 'false' are 
 allowed here.
 

roles/os_projects/tasks/users.yml

@@ -20,9 +20,7 @@
   vars:
     domain_is_id: "{{ project.user_domain in os_projects_domain_to_id.values() }}"
   loop_control:
-    label:
-      project: "{{ project.name }}"
-      user: "{{ item.name }}"
+    label: "{{ project.name }}: {{ item.name }}"
 
 - name: Ensure users have required project roles
   openstack.cloud.role_assignment:
@@ -41,10 +39,7 @@
     - skip_missing: true
   environment: "{{ os_projects_environment }}"
   loop_control:
-    label:
-      project: "{{ project.name }}"
-      user: "{{ item.0.name }}"
-      role: "{{ item.1 }}"
+    label: "{{ project.name }}: {{ item.0.name }}: {{ item.1 }}"
 
 - name: Ensure users have required domain roles
   openstack.cloud.role_assignment:
@@ -65,7 +60,4 @@
   vars:
     domain_is_id: "{{ project.user_domain in os_projects_domain_to_id.values() }}"
   loop_control:
-    label:
-      domain: "{{ project.user_domain }}"
-      user: "{{ item.0.name }}"
-      role: "{{ item.1 }}"
+    label: "{{ project.user_domain }}: {{ item.0.name }}: {{ item.1 }}"