bugfix: replace communishift_project_name with item.value.name

roles/communishift/library/communishift_storage_efs.py

@@ -49,7 +49,7 @@ author:
 EXAMPLES = r"""
 - name: Create the EFS AccessPoint
   communishift_storage_efs:
-    project_name: "{{ communishift_project_name }}"
+    project_name: "{{ item.value.name }}"
     aws_access_key_id: "{{ communishift_efs_access_key }}"
     aws_secret_access_key: "{{ communishift_efs_secret_key }}"
     aws_region: "{{ communishift_region }}"

roles/communishift/tasks/create-efs-secret.yml

@@ -8,8 +8,8 @@
       apiVersion: v1
       kind: Secret
       metadata:
-        name: "{{ communishift_project_name }}-efs-credentials"
-        namespace: "{{ communishift_project_name }}"
+        name: "{{ item.value.name }}-efs-credentials"
+        namespace: "{{ item.value.name }}"
       data:
         efs_filesystem_id: "{{ filesystem_id | b64encode }}"
         efs_accesspoint_id: "{{ accesspoint_id | b64encode }}"

roles/communishift/tasks/create-efs.yml

@@ -5,10 +5,10 @@
     aws_secret_key: "{{ communishift_efs_secret_key }}"
     region: "{{ communishift_region }}"
     state: present
-    name: "{{ communishift_project_name }}"
+    name: "{{ item.value.name }}"
     tags:
-      Name: "{{ communishift_project_name }}"
-      communishift: "{{ communishift_project_name }}"
+      Name: "{{ item.value.name }}"
+      communishift: "{{ item.value.name }}"
     targets:
       - subnet_id: "{{ communishift_subnet_id }}"
         security_groups: ["{{ communishift_security_group }}"]
@@ -22,7 +22,7 @@
 
 - name: Create the EFS AccessPoint
   communishift_storage_efs:
-    project_name: "{{ communishift_project_name }}"
+    project_name: "{{ item.value.name }}"
     aws_access_key_id: "{{ communishift_efs_access_key }}"
     aws_secret_access_key: "{{ communishift_efs_secret_key }}"
     aws_region: "{{ communishift_region }}"

roles/communishift/tasks/create-group.yml

@@ -3,7 +3,7 @@
   community.okd.k8s:
     api_key: "{{ communishift_ocp_api_token }}"
     host: "{{ communishift_ocp_api_host }}"
-    name: "{{ communishift_project_name }}-admins"
+    name: "{{ item.value.name }}-admins"
     api_version: user.openshift.io/v1
     kind: Group
     state: present

roles/communishift/tasks/create-limit-range.yml

@@ -8,8 +8,8 @@
       apiVersion: v1
       kind: LimitRange
       metadata:
-        name: "{{ communishift_project_name }}-limitrange"
-        namespace: "{{ communishift_project_name }}"
+        name: "{{ item.value.name }}-limitrange"
+        namespace: "{{ item.value.name }}"
       spec:
         limits:
           - default:

roles/communishift/tasks/create-namespace.yml

@@ -3,7 +3,7 @@
   community.okd.k8s:
     api_key: "{{ communishift_ocp_api_token }}"
     host: "{{ communishift_ocp_api_host }}"
-    name: "{{ communishift_project_name }}"
+    name: "{{ item.value.name }}"
     api_version: v1
     kind: Namespace
     state: present

roles/communishift/tasks/create-resource-quota.yml

@@ -8,8 +8,8 @@
       apiVersion: v1
       kind: ResourceQuota
       metadata:
-        name: "{{ communishift_project_name }}-quota"
-        namespace: "{{ communishift_project_name }}"
+        name: "{{ item.value.name }}-quota"
+        namespace: "{{ item.value.name }}"
       spec:
         hard:
           cpu: "{{ item.value.cpu_requests | 1 }}" # requests.cpu

roles/communishift/tasks/create-role-binding.yml

@@ -8,8 +8,8 @@
       apiVersion: rbac.authorization.k8s.io/v1
       kind: RoleBinding
       metadata:
-        name: "{{ communishift_project_name }}-group-rolebinding"
-        namespace: "{{ communishift_project_name }}"
+        name: "{{ item.value.name }}-group-rolebinding"
+        namespace: "{{ item.value.name }}"
       roleRef:
         apiGroup: rbac.authorization.k8s.io
         kind: ClusterRole
@@ -17,7 +17,7 @@
       subjects:
         - apiGroup: rbac.authorization.k8s.io
           kind: Group
-          name: "{{ communishift_project_name }}-admins"
+          name: "{{ item.value.name }}-admins"
 
 - name: Create a k8s RoleBinding for storage permissions
   community.okd.k8s:
@@ -28,13 +28,13 @@
       apiVersion: rbac.authorization.k8s.io/v1
       kind: RoleBinding
       metadata:
-        name: "{{ communishift_project_name }}-efs-rolebinding"
-        namespace: "{{ communishift_project_name }}"
+        name: "{{ item.value.name }}-efs-rolebinding"
+        namespace: "{{ item.value.name }}"
       roleRef:
         apiGroup: rbac.authorization.k8s.io
         kind: Role
-        name: "{{ communishift_project_name }}-efs-role"
+        name: "{{ item.value.name }}-efs-role"
       subjects:
         - apiGroup: rbac.authorization.k8s.io
           kind: Group
-          name: "{{ communishift_project_name }}-admins"
+          name: "{{ item.value.name }}-admins"

roles/communishift/tasks/create-role.yml

@@ -8,8 +8,8 @@
       apiVersion: rbac.authorization.k8s.io/v1
       kind: Role
       metadata:
-        name: "{{ communishift_project_name }}-efs-role"
-        namespace: "{{ communishift_project_name }}"
+        name: "{{ item.value.name }}-efs-role"
+        namespace: "{{ item.value.name }}"
       rules:
         - apiGroups:
             - aws-efs.managed.openshift.io