From 54003d7b5e33ffeb9667fd789815247d78bc5124 Mon Sep 17 00:00:00 2001 From: David Kirwan Date: Jul 24 2024 13:30:47 +0000 Subject: firmitas: reuse slurp, remove b64encode Signed-off-by: David Kirwan --- diff --git a/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml b/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml index 1830ba9..ecec0e0 100644 --- a/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml +++ b/roles/openshift-apps/firmitas/tasks/create-firmitas-configuration-secret.yml @@ -21,15 +21,15 @@ tags: - firmitas-configuration-secret -#- name: read remote values.txt -# register: firmitas_myconfig_py_file -# ansible.builtin.slurp: -# src: "/root/ocp4/openshift-apps/firmitas/myconfig.py" +- name: read remote values.txt + register: firmitas_myconfig_py_file + ansible.builtin.slurp: + src: "/root/ocp4/openshift-apps/firmitas/myconfig.py" -#- name: read remote values.txt -# register: firmitas_certlist_yml_file -# ansible.builtin.slurp: -# src: "/root/ocp4/openshift-apps/firmitas/certlist.yml" +- name: read remote values.txt + register: firmitas_certlist_yml_file + ansible.builtin.slurp: + src: "/root/ocp4/openshift-apps/firmitas/certlist.yml" # Create the Secret from this file @@ -39,15 +39,6 @@ src: "secret-configuration.yml" dest: "/root/ocp4/openshift-apps/firmitas/secret-configuration.yml" mode: 0600 - vars: - firmitas_myconfig_py_file: - "{{ lookup('file', - '/root/ocp4/openshift-apps/firmitas/myconfig.py') - }}" - firmitas_certlist_yml_file: - "{{ lookup('file', - '/root/ocp4/openshift-apps/firmitas/certlist.yml') - }}" # apply the openshift resources diff --git a/roles/openshift-apps/firmitas/templates/secret-configuration.yml b/roles/openshift-apps/firmitas/templates/secret-configuration.yml index 966ec82..b9f7306 100644 --- a/roles/openshift-apps/firmitas/templates/secret-configuration.yml +++ b/roles/openshift-apps/firmitas/templates/secret-configuration.yml @@ -5,6 +5,6 @@ metadata: namespace: "{{ firmitas_namespace }}" data: myconfig.py: - "{{ firmitas_myconfig_py_file | b64encode }}" + "{{ firmitas_myconfig_py_file }}" certlist.yml: - "{{ firmitas_certlist_yml_file | b64encode }}" + "{{ firmitas_certlist_yml_file }}"