aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorPaul Bonaud <paul.bonaud@fretlink.com>2018-09-28 11:14:12 +0200
committerPaul Bonaud <paul.bonaud@fretlink.com>2018-09-28 11:27:10 +0200
commit1157a45f9ca2f579b11462865271379d175127fc (patch)
treeb4fdb60a3d47943f83391214c2a9b9a5835fc250
parentda999d16b410b3b6892c4ffa692c1a860d1e2781 (diff)
downloadansible-clever-1157a45f9ca2f579b11462865271379d175127fc.tar.gz
ansible-clever-1157a45f9ca2f579b11462865271379d175127fc.tar.zst
ansible-clever-1157a45f9ca2f579b11462865271379d175127fc.zip
domain: allow the domain to be specified via clever_domain variable
Every other variables are prefixed with `clever_` which makes the definition of variables clearer from a "app" configuration point of view. WDYT?
-rw-r--r--README.md3
-rw-r--r--tasks/deploy.yml4
2 files changed, 4 insertions, 3 deletions
diff --git a/README.md b/README.md
index e6d607c..5c3b999 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,8 @@ Variables for the application
26- `clever_addons`: a list of dict describing addons enabled for the application from which we would use information during deploy, optional.<br/> 26- `clever_addons`: a list of dict describing addons enabled for the application from which we would use information during deploy, optional.<br/>
27 Example: `{ name: pg, env_prefix: POSTGRESQL_ADDON }` 27 Example: `{ name: pg, env_prefix: POSTGRESQL_ADDON }`
28- `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. 28- `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- `domain`: the domain from which the application should be reachable, optional 29- `clever_domain`: the domain from which the application should be reachable, optional.
30- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role.
30- `syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`. 31- `syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`.
31- `clever_metrics`: a boolean to enable or disable metrics support. Optional, default to `false`. 32- `clever_metrics`: a boolean to enable or disable metrics support. Optional, default to `false`.
32 33
diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 4b3f48b..205eb2b 100644
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -6,10 +6,10 @@
6 CONFIGURATION_FILE: "{{ clever_login_file }}" 6 CONFIGURATION_FILE: "{{ clever_login_file }}"
7 7
8- name: Configure Domain 8- name: Configure Domain
9 when: domain is defined 9 when: domain is defined or clever_domain is defined
10 command: clever-set-domain.sh 10 command: clever-set-domain.sh
11 environment: 11 environment:
12 DOMAIN: "{{ domain }}" 12 DOMAIN: "{{ clever_domain | default(domain) }}"
13 CONFIGURATION_FILE: "{{ clever_login_file }}" 13 CONFIGURATION_FILE: "{{ clever_login_file }}"
14 14
15- name: Push Environment 15- name: Push Environment