BC-331 - BC-353 - rename ansible variables for OnePassword (#76)

hpi-schul-cloud · Sep 29, 2021 · aa90ee2 · aa90ee2
1 parent 798fba0
commit aa90ee2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ansible/roles/schulcloud-editor/tasks/main.yml b/ansible/roles/schulcloud-editor/tasks/main.yml
@@ -15,18 +15,18 @@
       kubeconfig: ~/.kube/config 
       namespace: "{{ NAMESPACE }}"
       template: secret.yml.j2
-    when: ONEPASSWORD is undefined or ONEPASSWORD is defined and not ONEPASSWORD
+    when: ONEPASSWORD_OPERATOR is undefined or ONEPASSWORD_OPERATOR is defined and not ONEPASSWORD_OPERATOR
 
   - name: Secred by 1Password
     community.kubernetes.k8s:
       kubeconfig: ~/.kube/config 
       namespace: "{{ NAMESPACE }}"
       template: onepassword.yml.j2
-    when: ONEPASSWORD is defined and ONEPASSWORD|bool
+    when: ONEPASSWORD_OPERATOR is defined and ONEPASSWORD_OPERATOR|bool
 
   - name: Deployment
     community.kubernetes.k8s:
       kubeconfig: ~/.kube/config 
       namespace: "{{ NAMESPACE }}"
       template: deployment.yml.j2
-
+
diff --git a/ansible/roles/schulcloud-editor/templates/onepassword.yml.j2 b/ansible/roles/schulcloud-editor/templates/onepassword.yml.j2
@@ -6,4 +6,4 @@ metadata:
   labels:
     app: editor
 spec:
-  itemPath: "vaults/{{ VAULT }}/items/editor"
+  itemPath: "vaults/{{ ONEPASSWORD_OPERATOR_VAULT }}/items/editor"