Merge pull request #12 from ati90ati/support-env-variables

#11 Add support for environment variables in EnvironmentFile

.gitignore

@@ -12,4 +12,7 @@
 *.pytest_cache/
 
 # Tox
-.tox/
+.tox/
+
+# IntelliJ IDEA
+.idea/

README.md

@@ -59,6 +59,7 @@ Role Variables
 | sb_app_healthcheck_ports  | false     | *None*          | TCP Ports to check if the service is healthy (should be an array)|
 | sb_app_service_java_home  | false     | *None*          | Set the __JAVA_HOME__ to use |
 | sb_app_stop_wait_time  | false     | 60 secs         | The time in seconds to wait when stopping the application before forcing a shutdown  |
+| sb_app_env  | false     | array with name and value        | Environment variables that will be added in the EnvironmentFile  |
 
 
 
@@ -95,6 +96,11 @@ Example Playbook
             - "http://localhost:8082/actuator/health"
           sb_app_healthcheck_ports:
             - 8082
+          sb_app_env:
+            - name: LOGGING_PATH
+              value: "{{ sb_applications_root_folder }}/{{ sb_app_name | upper }}/logs"
+            - name: SERVER_PORT
+              value: 8080
 
 ### Using maven artifact from maven repository
 
@@ -120,6 +126,11 @@ Example Playbook
             - "http://localhost:8082/actuator/health"
           sb_app_healthcheck_ports:
             - 8082
+          sb_app_env:
+            - name: LOGGING_PATH
+              value: "{{ sb_applications_root_folder }}/{{ sb_app_name | upper }}/logs"
+            - name: SERVER_PORT
+              value: 8080
 
 ### Deploy multiple microservices to the same hosts
 

defaults/main.yml

@@ -30,3 +30,5 @@ sb_app_healthcheck_urls_retry_delay: 6
 
 # HealthCheck TCP Port timeout in seconds
 sb_app_healthcheck_ports_timeout: 60
+
+sb_app_env: []

molecule/default/playbook.yml

@@ -37,3 +37,4 @@
       sb_app_healthcheck_ports:
         - 8080
         - 8443
+      sb_app_env: []

templates/app.conf.j2

@@ -16,3 +16,6 @@ LOG_FILENAME={{ sb_initd_log_filename }}
 {% if sb_app_stop_wait_time is defined %}
 STOP_WAIT_TIME={{ sb_app_stop_wait_time }}
 {% endif %}
+{% for item in sb_app_env %}
+{{item.name}}="{{item.value | regex_replace('"', '\\"')}}"
+{% endfor %}