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?

diff --git a/README.md b/README.md
index e6d607cad18a3581dde695b58f05e1378e069807..5c3b999c4f8764b65d4c4f60596bf0fd639bf8b6 100644 (file)
--- a/README.md
+++ b/README.md
@@ -26,7 +26,8 @@ Variables for the application
 - `clever_addons`: a list of dict describing addons enabled for the application from which we would use information during deploy, optional.<br/>
   Example: `{ name: pg, env_prefix: POSTGRESQL_ADDON }`
 - `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.
-- `domain`: the domain from which the application should be reachable, optional
+- `clever_domain`: the domain from which the application should be reachable, optional.
+- _Obsolete_: `domain`: Same as above but was replaced by `clever_domain` since v1.4 of this role.
 - `syslog_server`: UDP Syslog server to be used as UDPSyslog drain for the application, optional. Example: `udp://198.51.100.51:12345`.
 - `clever_metrics`: a boolean to enable or disable metrics support. Optional, default to `false`.
 

diff --git a/tasks/deploy.yml b/tasks/deploy.yml
index 4b3f48b61077089db2e30f55c28312caf3378748..205eb2babf7479a49fe1343dc5c1830fe7bb1658 100644 (file)
--- a/tasks/deploy.yml
+++ b/tasks/deploy.yml
@@ -6,10 +6,10 @@
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Configure Domain
-  when: domain is defined
+  when: domain is defined or clever_domain is defined
   command: clever-set-domain.sh
   environment:
-    DOMAIN: "{{ domain }}"
+    DOMAIN: "{{ clever_domain | default(domain) }}"
     CONFIGURATION_FILE: "{{ clever_login_file }}"
 
 - name: Push Environment