Merge pull request #662 from edx/e0d/forum-vars

E0d/forum vars

playbooks/roles/forum/defaults/main.yml

@@ -15,11 +15,12 @@ FORUM_MONGO_USER: "cs_comments_service"
 FORUM_MONGO_PASSWORD: "password"
 FORUM_MONGO_HOSTS:
   - "localhost"
+FORUM_MONGO_TAGS: !!null
 FORUM_MONGO_PORT: "27017"
 FORUM_MONGO_DATABASE: "cs_comments_service"
 FORUM_MONGO_URL: "mongodb://{{ FORUM_MONGO_USER }}:{{ FORUM_MONGO_PASSWORD }}@{%- for host in FORUM_MONGO_HOSTS -%}
-{{host}}:{{ FORUM_MONGO_PORT }}{%- if not loop.last -%},{%- endif -%}
-{%- endfor -%}/{{ FORUM_MONGO_DATABASE }}"
+{{host}}:{{ FORUM_MONGO_PORT }}{%- if not loop.last -%},{%- endif -%}/{{ FORUM_MONGO_DATABASE }}{%- if FORUM_MONGO_TAGS -%}?{{ FORUM_MONGO_TAGS }}{%- endif -%}
+{%- endfor -%}"
 FORUM_SINATRA_ENV: "development"
 FORUM_RACK_ENV: "development"
 FORUM_NGINX_PORT: "18080"

playbooks/roles/forum/templates/forum_env.j2

 # {{ ansible_managed }}
-{% for name,value in forum_environment.items() %}
-{%- if value %}
+
+{% for name,value in forum_environment.items() -%}
+{%- if value -%}
 export {{ name }}="{{ value }}"
-{%- endif %}                 
-{% endfor %}
+{% endif %}                 
+{%- endfor %}
+
 eval "$(rbenv init -)"