Merge pull request #2627 from edx/named-release/dogwood.rc

Dogwood.rc fixes

playbooks/roles/vhost/tasks/main.yml

@@ -31,7 +31,7 @@
     mode: "{{ item.mode | default(644) }}"
   register: config_templates
   with_items:
-    - { src: 'etc/motd.tail.j2', dest: '/etc/motd.tail', mode: '755' }
+    - { src: 'etc/{{ COMMON_MOTD_TEMPLATE }}', dest: '/etc/motd.tail', mode: '755' }
     - { src: 'etc/ssh/sshd_config.j2', dest: '/etc/ssh/sshd_config' }
     
 - name: restart ssh

vagrant/base/devstack/Vagrantfile

@@ -20,20 +20,26 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box_url = "http://files.vagrantup.com/precise64.box"
 
   config.vm.network :private_network, ip: vm_guest_ip
-  config.vm.network :forwarded_port, guest: 8000, host: 8000  # LMS
-  config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
-  config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
-  config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
-  config.vm.network :forwarded_port, guest: 8004, host: 8004  # Programs
-  config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
-  config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
-  config.vm.network :forwarded_port, guest: 8765, host: 8765
-  config.vm.network :forwarded_port, guest: 9200, host: 9200
-  config.vm.network :forwarded_port, guest: 18080, host: 18080
-  config.vm.network :forwarded_port, guest: 8100, host: 8100  # Analytics Data API
-  config.vm.network :forwarded_port, guest: 8110, host: 8110  # Insights
-  config.vm.network :forwarded_port, guest: 50070, host: 50070  # HDFS Admin UI
-  config.vm.network :forwarded_port, guest: 8088, host: 8088  # Hadoop Resource Manager
+
+  # If you want to run the box but don't need network ports, set VAGRANT_NO_PORTS=1.
+  # This is useful if you want to run more than one box at once.
+  if not ENV['VAGRANT_NO_PORTS']
+    config.vm.network :forwarded_port, guest: 8000, host: 8000  # LMS
+    config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
+    config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
+    config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
+    config.vm.network :forwarded_port, guest: 8004, host: 8004  # Programs
+    config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
+    config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
+    config.vm.network :forwarded_port, guest: 8765, host: 8765
+    config.vm.network :forwarded_port, guest: 9200, host: 9200
+    config.vm.network :forwarded_port, guest: 18080, host: 18080
+    config.vm.network :forwarded_port, guest: 8100, host: 8100  # Analytics Data API
+    config.vm.network :forwarded_port, guest: 8110, host: 8110  # Insights
+    config.vm.network :forwarded_port, guest: 50070, host: 50070  # HDFS Admin UI
+    config.vm.network :forwarded_port, guest: 8088, host: 8088  # Hadoop Resource Manager
+  end
+
   config.ssh.insert_key = true
 
  # Enable X11 forwarding so we can interact with GUI applications

vagrant/release/devstack/Vagrantfile

@@ -60,6 +60,12 @@ end
 # to a name and a file path, which are used for retrieving
 # a Vagrant box from the internet.
 openedx_releases = {
+  "named-release/dogwood.rc" => {
+    :name => "dogwood-devstack-rc2", :file => "20151221-dogwood-devstack-rc2.box",
+  },
+  "named-release/dogwood.rc2" => {
+    :name => "dogwood-devstack-rc2", :file => "20151221-dogwood-devstack-rc2.box",
+  },
   "named-release/cypress" => {
     :name => "cypress-devstack", :file => "cypress-devstack.box",
   },
@@ -88,20 +94,25 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box_url = "http://files.edx.org/vagrant-images/#{openedx_releases[rel][:file]}"
 
   config.vm.network :private_network, ip: "192.168.33.10"
-  config.vm.network :forwarded_port, guest: 8000, host: 8000  # LMS
-  config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
-  config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
-  config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
-  config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
-  config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
-  config.vm.network :forwarded_port, guest: 8765, host: 8765
-  config.vm.network :forwarded_port, guest: 9200, host: 9200  # Elasticsearch
-  config.vm.network :forwarded_port, guest: 18080, host: 18080  # Forums
-  config.vm.network :forwarded_port, guest: 8100, host: 8100  # Analytics Data API
-  config.vm.network :forwarded_port, guest: 8110, host: 8110  # Insights
-  config.vm.network :forwarded_port, guest: 9876, host: 9876  # ORA2 Karma tests
-  config.vm.network :forwarded_port, guest: 50070, host: 50070  # HDFS Admin UI
-  config.vm.network :forwarded_port, guest: 8088, host: 8088  # Hadoop Resource Manager
+
+  # If you want to run the box but don't need network ports, set VAGRANT_NO_PORTS=1.
+  # This is useful if you want to run more than one box at once.
+  if not ENV['VAGRANT_NO_PORTS']
+    config.vm.network :forwarded_port, guest: 8000, host: 8000  # LMS
+    config.vm.network :forwarded_port, guest: 8001, host: 8001  # Studio
+    config.vm.network :forwarded_port, guest: 8002, host: 8002  # Ecommerce
+    config.vm.network :forwarded_port, guest: 8003, host: 8003  # LMS for Bok Choy
+    config.vm.network :forwarded_port, guest: 8031, host: 8031  # Studio for Bok Choy
+    config.vm.network :forwarded_port, guest: 8120, host: 8120  # edX Notes Service
+    config.vm.network :forwarded_port, guest: 8765, host: 8765
+    config.vm.network :forwarded_port, guest: 9200, host: 9200  # Elasticsearch
+    config.vm.network :forwarded_port, guest: 18080, host: 18080  # Forums
+    config.vm.network :forwarded_port, guest: 8100, host: 8100  # Analytics Data API
+    config.vm.network :forwarded_port, guest: 8110, host: 8110  # Insights
+    config.vm.network :forwarded_port, guest: 9876, host: 9876  # ORA2 Karma tests
+    config.vm.network :forwarded_port, guest: 50070, host: 50070  # HDFS Admin UI
+    config.vm.network :forwarded_port, guest: 8088, host: 8088  # Hadoop Resource Manager
+  end
   config.ssh.insert_key = true
 
   config.vm.synced_folder  ".", "/vagrant", disabled: true

vagrant/release/fullstack/Vagrantfile

@@ -9,6 +9,12 @@ CPU_COUNT = 2
 # to a name and a file path, which are used for retrieving
 # a Vagrant box from the internet.
 openedx_releases = {
+  "named-release/dogwood.rc" => {
+    :name => "dogwood-fullstack-rc2", :file => "20151221-dogwood-fullstack-rc2.box",
+  },
+  "named-release/dogwood.rc2" => {
+    :name => "dogwood-fullstack-rc2", :file => "20151221-dogwood-fullstack-rc2.box",
+  },
   "named-release/cypress" => {
     :name => "cypress-fullstack", :file => "cypress-fullstack.box",
   },