Merge pull request #156 from edx/jarv/single-instance-fixes

Jarv/single instance fixes

playbooks/edx_sandbox.yml

-- name: Create sandbox instance
-  hosts: localhost
-  connection: local
-  gather_facts: False
-  vars:
-    keypair: continuous-integration
-    instance_type: m1.xlarge
-    security_group: sandbox
-    image: ami-d0f89fb9
-    region: us-east-1
-    instance_tags: '{"Name": "edx-sandbox"}'
-  roles:
-    - launch_instance
-
+# This playbook is to configure
+# the official edX sandbox instance
+# sandbox.edx.org
+#
+# On the machine you want to configure run the following
+# command from the configuration/playbooks directory:
+#   ansible-playbook -c local --limit "localhost:127.0.0.1" /path/to/configuration/playbooks/edx_sandbox.yml -i "localhost,"
+# 
+# To use different default ports for lms-preview, cms and to set the lms_base and lms_preview_base,
+# for the following configuration:
+#   studio listening on port 80 - studio.example.com
+#   lms listening on port 80 - example.com
+#   lms-preview listening on port 80 - preview.example.com
+#
+#   ansible-playbook -c local --limit "localhost:127.0.0.1" path/to/configuration/playbooks/edx_sandbox.yml -i "localhost," -e "cms_nginx_port=80 lms_preview_nginx_port=80 c_lms_base=example.com  c_preview_lms_base=preview.example.com"
+#
 - name: Configure instance(s)
-  hosts: launched
+  hosts: localhost
   sudo: True
   gather_facts: True
   vars:

playbooks/roles/common/tasks/main.yml

@@ -35,16 +35,7 @@
   
 - name: Install role-independent useful system packages
   # do this before log dir setup; rsyslog package guarantees syslog user present
-  apt: pkg={{item}} install_recommends=yes state=present update_cache=yes
-  with_items:
-  - ack-grep
-  - lynx-cur
-  - logrotate
-  - mosh
-  - rsyslog
-  - screen
-  - tree
-  - git
+  apt: pkg={{','.join(common_debian_pkgs)}} install_recommends=yes state=present update_cache=yes
   tags:
   - pre_install
   - update

playbooks/roles/common/vars/main.yml

+common_debian_pkgs:
+  - ack-grep
+  - lynx-cur
+  - logrotate
+  - mosh
+  - rsyslog
+  - screen
+  - tree
+  - git

playbooks/roles/edxapp/vars/main.yml

@@ -8,6 +8,11 @@
 # the defaults should be appropriate for running
 # all roles on a single instance
 
+# These are custom variables that can be overridden
+# on the command line to change specific values in the hash
+c_lms_base: ''
+c_preview_lms_base: ''
+
 #Use YAML references (& and *) and hash merge <<: to factor out shared settings
 #see http://atechie.net/2009/07/merging-hashes-in-yaml-conf-files/
 edxapp_generic_auth_config:  &edxapp_generic_auth
@@ -68,6 +73,7 @@ edxapp_generic_auth_config:  &edxapp_generic_auth
   'CELERY_BROKER_PASSWORD': ''
  
 generic_env_config:  &edxapp_generic_env
+  'LMS_BASE': "{{ c_lms_base }}"
   'BOOK_URL':  ''
   'CERT_QUEUE':  'certificates'
   'LOCAL_LOGLEVEL':  'INFO'
@@ -81,6 +87,7 @@ generic_env_config:  &edxapp_generic_env
     'ENABLE_PEARSON_HACK_TEST': false
     'SUBDOMAIN_BRANDING': false
     'SUBDOMAIN_COURSE_LISTINGS': false
+    'PREVIEW_LMS_BASE': "{{ c_preview_lms_base }}"
   'WIKI_ENABLED': true
   'SYSLOG_SERVER':  'syslog.a.m.i4x.org'
   'SITE_NAME':  'example.com'