var refactoring for deployment usecase

playbooks/roles/forum/defaults/main.yml

@@ -15,33 +15,32 @@ FORUM_MONGO_USER: "cs_comments_service"
 FORUM_MONGO_PASSWORD: "password"
 FORUM_MONGO_HOST: "localhost"
 FORUM_MONGO_PORT: "27017"
+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_SINATRA_ENV: "development"
+FORUM_RACK_ENV: "development"
+FORUM_NGINX_PORT: 80
+FORUM_API_KEY: "password"
+FORUM_ELASTICSEARCH_HOST: "localhost"
+FORUM_ELASTICSEARCH_PORT: "9200"
+FORUM_ELASTICSEARCH_URL: "http://{{ FORUM_ELASTICSEARCH_HOST }}:{{ FORUM_ELASTICSEARCH_PORT }}"
 
 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_PASS: "{{ FORUM_MONGO_PASSWORD }}"
-  RACK_ENV: "{{ forum_rack_env }}"
+  RACK_ENV: "{{ FORUM_RACK_ENV }}"
   SINATRA_ENV: "{{ FORUM_SINATRA_ENV }}"
-  API_KEY: "{{ forum_api_key }}"
-  SEARCH_SERVER: "{{ forum_elasticsearch_url }}"
-  MONGOHQ_URL: "{{ forum_mongo_url }}"
+  API_KEY: "{{ FORUM_API_KEY }}"
+  SEARCH_SERVER: "{{ FORUM_ELASTICSEARCH_URL }}"
+  MONGOHQ_URL: "{{ FORUM_MONGO_URL }}"
   HOME: "{{ forum_app_dir }}"
 
 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_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_api_key: "password"
-forum_elasticsearch_host: "localhost"
-forum_elasticsearch_port: "9200"
-forum_elasticsearch_url: "http://{{ forum_elasticsearch_host }}:{{ forum_elasticsearch_port }}"
 
 #
 # test config
@@ -53,7 +52,5 @@ forum_elasticsearch_url: "http://{{ forum_elasticsearch_host }}:{{ forum_elastic
 #
 forum_services:
   - {service: "sinatra", host: "localhost", port: "4567"}
-  - {service: "mongo", host: "{{ FORUM_MONGO_HOST  }}", port: "27017"}
-  - {service: "mongo", host: "{{ FORUM_MONGO_HOST }}", port: "28017"}
-  - {service: "elasticsearch", host: "{{ forum_elasticsearch_host }}", port: "9200"}
-  - {service: "elasticsearch", host: "{{ forum_elasticsearch_host }}", port: "9300"}
+  - {service: "mongo", host: "{{ FORUM_MONGO_HOST  }}", port: "{{ FORUM_MONGO_PORT }}"}
+  - {service: "elasticsearch", host: "{{ FORUM_ELASTICSEARCH_HOST }}", port: "{{ FORUM_ELASTICSEARCH_PORT }}"}
\ No newline at end of file