Pull out forums settings that we may want to override.

playbooks/roles/forum/defaults/main.yml

@@ -11,15 +11,21 @@ forum_gem_root: "{{ forum_rbenv_dir }}/.gem"
 forum_gem_bin: "{{ forum_gem_root }}/bin"
 forum_path: "{{ forum_code_dir }}/bin:{{ forum_rbenv_bin }}:{{ forum_rbenv_shims }}:{{ forum_gem_bin }}:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
+FORUM_MONGO_USER: "cs_comments_service"
+FORUM_MONGO_PASSWORD: "password"
+FORUM_MONGO_HOST: "localhost"
+FORUM_MONGO_PORT: "27017"
+FORUM_SINATRA_ENV: "development"
+
 forum_environment:
   RBENV_ROOT: "{{ forum_rbenv_root }}"
   GEM_HOME: "{{ forum_gem_root }}"
   GEM_PATH: "{{ forum_gem_root }}"
   PATH: "{{ forum_path }}"
-  MONGOHQ_USER: "{{ forum_mongo_user }}"
+  MONGOHQ_USER: "{{ FORUM_MONGO_USER }}"
   MONGOHQ_PASS: "{{ FORUM_MONGO_PASSWORD }}"
   RACK_ENV: "{{ forum_rack_env }}"
-  SINATRA_ENV: "{{ forum_sinatra_env }}"
+  SINATRA_ENV: "{{ FORUM_SINATRA_ENV }}"
   API_KEY: "{{ forum_api_key }}"
   SEARCH_SERVER: "{{ forum_elasticsearch_url }}"
   MONGOHQ_URL: "{{ forum_mongo_url }}"
@@ -29,14 +35,9 @@ forum_user: "forum"
 forum_ruby_version: "1.9.3-p448"
 forum_source_repo: "https://github.com/edx/cs_comments_service.git"
 forum_version: "HEAD"
-FORUM_MONGO_USER: "cs_comments_service"
-FORUM_MONGO_PASSWORD: "password"
-FORUM_MONGO_HOST: "localhost"
-FORUM_MONGO_PORT: "27010"
 forum_mongo_database: "cs_comments_service"
 forum_mongo_url: "mongodb://{{ FORUM_MONGO_USER }}:{{ FORUM_MONGO_PASSWORD }}@{{ FORUM_MONGO_HOST }}:{{ FORUM_MONGO_PORT }}/{{ forum_mongo_database }}"
 forum_rack_env: "development"
-forum_sinatra_env: "development"
 forum_api_key: "password"
 forum_elasticsearch_host: "localhost"
 forum_elasticsearch_port: "9200"