From ba2672a0b051f35511400cd96f49540c145968ac Mon Sep 17 00:00:00 2001 From: Shane McDonald Date: Sat, 3 Apr 2021 11:57:23 -0400 Subject: [PATCH] Remove usage of environment.sh This is no longer sourced in the launch scripts. --- roles/installer/templates/environment.sh.j2 | 5 ----- roles/installer/templates/tower_app_credentials.yaml.j2 | 1 - roles/installer/templates/tower_deployment.yaml.j2 | 2 -- 3 files changed, 8 deletions(-) delete mode 100644 roles/installer/templates/environment.sh.j2 diff --git a/roles/installer/templates/environment.sh.j2 b/roles/installer/templates/environment.sh.j2 deleted file mode 100644 index 28a4ea66..00000000 --- a/roles/installer/templates/environment.sh.j2 +++ /dev/null @@ -1,5 +0,0 @@ -DATABASE_USER={{ awx_postgres_user }} -DATABASE_NAME={{ awx_postgres_database }} -DATABASE_HOST={{ awx_postgres_host }} -DATABASE_PORT={{ awx_postgres_port }} -DATABASE_PASSWORD={{ awx_postgres_pass | quote }} diff --git a/roles/installer/templates/tower_app_credentials.yaml.j2 b/roles/installer/templates/tower_app_credentials.yaml.j2 index fc0ac040..50eca503 100644 --- a/roles/installer/templates/tower_app_credentials.yaml.j2 +++ b/roles/installer/templates/tower_app_credentials.yaml.j2 @@ -7,5 +7,4 @@ metadata: namespace: '{{ meta.namespace }}' data: credentials_py: "{{ lookup('template', 'credentials.py.j2') | b64encode }}" - environment_sh: "{{ lookup('template', 'environment.sh.j2') | b64encode }}" ldap_py: "{{ lookup('template', 'ldap.py.j2') | b64encode }}" diff --git a/roles/installer/templates/tower_deployment.yaml.j2 b/roles/installer/templates/tower_deployment.yaml.j2 index 40ea2be0..124e1157 100644 --- a/roles/installer/templates/tower_deployment.yaml.j2 +++ b/roles/installer/templates/tower_deployment.yaml.j2 @@ -218,8 +218,6 @@ spec: items: - key: credentials_py path: 'credentials.py' - - key: environment_sh - path: 'environment.sh' - key: ldap_py path: 'ldap.py' - name: "{{ secret_key_secret_name }}"