Merge pull request #3972 from edx/nedbat/pin-discovery

Pin the discovery version to the release we want

playbooks/vagrant-devstack.yml

@@ -5,6 +5,7 @@
   vars:
     migrate_db: 'yes'
     devstack: true
+    edx_django_service_is_devstack: true
     disable_edx_services: true
     mongo_enable_journal: false
     EDXAPP_NO_PREREQ_INSTALL: 0

vagrant/base/devstack/Vagrantfile

@@ -26,6 +26,7 @@ VERSION_VARS = [
     'NOTIFIER_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
+    'DISCOVERY_VERSION',
 ]
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
@@ -51,6 +52,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     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
+    config.vm.network :forwarded_port, guest: 18381, host: 18381    # Course discovery
   end
 
   config.ssh.insert_key = true

vagrant/base/fullstack/Vagrantfile

@@ -23,6 +23,7 @@ VERSION_VARS = [
     'NOTIFIER_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
+    'DISCOVERY_VERSION',
 ]
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|

vagrant/release/devstack/Vagrantfile

@@ -21,6 +21,7 @@ VERSION_VARS = [
     'NOTIFIER_VERSION',
     'ECOMMERCE_VERSION',
     'ECOMMERCE_WORKER_VERSION',
+    'DISCOVERY_VERSION',
 ]
 
 MOUNT_DIRS = {
@@ -134,6 +135,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     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
+    config.vm.network :forwarded_port, guest: 18381, host: 18381    # Course discovery
   end
   config.ssh.insert_key = true