aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPaul Bonaud <paul.bonaud@fretlink.com>2020-06-19 16:20:43 +0200
committerPaul Bonaud <paul.bonaud@fretlink.com>2020-06-19 17:12:15 +0200
commit50411cbb2d091a3bca251e8cd1f599928141cb7b (patch)
treed92cded89530738b61ab4e6735f9f49a102fc467
parent037673812bd192ffb122cc22e9f3028afcc58399 (diff)
downloadansible-clever-50411cbb2d091a3bca251e8cd1f599928141cb7b.tar.gz
ansible-clever-50411cbb2d091a3bca251e8cd1f599928141cb7b.tar.zst
ansible-clever-50411cbb2d091a3bca251e8cd1f599928141cb7b.zip
fix: make sure not to include unecessary ENV variable
This is a fix to an unfortunate bug introduced by #64 because we had a default value set to `None` on the `clever_haskell_entry_point`. Ansible considers `None` as a defined value so the `is defined` condition doesn't match our need
-rw-r--r--README.md1
-rw-r--r--defaults/main.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/README.md b/README.md
index 7a4557b..c0f7959 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@ Variables for the application
28 Example: `{ name: pg, env_prefix: POSTGRESQL_ADDON }` 28 Example: `{ name: pg, env_prefix: POSTGRESQL_ADDON }`
29- `clever_app_tasks_file`: tasks file to be executed after environment and addons variables where gathered. Specific to an app, should be use to run migrations. Optional. 29- `clever_app_tasks_file`: tasks file to be executed after environment and addons variables where gathered. Specific to an app, should be use to run migrations. Optional.
30- `clever_haskell_entry_point`: the haskell executable name to be executed by clever cloud, optional. 30- `clever_haskell_entry_point`: the haskell executable name to be executed by clever cloud, optional.
31- _Obsolete_: `clever_entry_point`: Same as above but was replaced by `clever_haskell_entry_point` since v1.14 of this role.
32- `clever_domain`: the domain from which the application should be reachable, optional. 31- `clever_domain`: the domain from which the application should be reachable, optional.
33- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role. 32- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role.
34- `clever_syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`. 33- `clever_syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`.
diff --git a/defaults/main.yml b/defaults/main.yml
index bd3b6a6..4e2ef8e 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -6,7 +6,6 @@ clever_app_root: "{{ app_root | default(playbook_dir + '/..') }}"
6clever_app_confdir: "{{ clever_app_root }}/.clever_cloud" 6clever_app_confdir: "{{ clever_app_root }}/.clever_cloud"
7clever_login_file: "{{ clever_app_confdir }}/login" 7clever_login_file: "{{ clever_app_confdir }}/login"
8 8
9clever_haskell_entry_point: "{{ clever_entry_point | default(None) }}"
10clever_haskell_env: {} 9clever_haskell_env: {}
11clever_env: {} 10clever_env: {}
12 11