Merge pull request #728

Author: jmikola

CONTRIBUTING.md

@@ -30,7 +30,6 @@ URIs and resemble the following:
 ```
 {
     "STANDALONE": "mongodb:\/\/192.168.112.10:2000",
-    "STANDALONE_26": "mongodb:\/\/192.168.112.10:2600",
     "STANDALONE_30": "mongodb:\/\/192.168.112.10:2700",
     "STANDALONE_SSL": "mongodb:\/\/192.168.112.10:2100",
     "STANDALONE_AUTH": "mongodb:\/\/root:[email protected]:2200\/?authSource=admin",

Vagrantfile

@@ -18,13 +18,10 @@ Vagrant.configure(2) do |config|
   config.vm.define "mo", primary: true do |mo|
     mo.vm.network "private_network", ip: "192.168.112.10"
 
-    mo.vm.box = "http://files.vagrantup.com/precise64.box"
-    mo.vm.provider "vmware_workstation" do |vmware, override|
-      override.vm.box_url = 'http://files.vagrantup.com/precise64_vmware.box'
-      override.vm.provision "shell", path: "scripts/vmware/kernel.sh", privileged: true
-    end
+    mo.vm.box = "ubuntu/trusty64"
 
     mo.vm.provision "shell", path: "scripts/ubuntu/essentials.sh", privileged: true
+    mo.vm.provision "file", source: "scripts/ubuntu/get-pip.py", destination: "get-pip.py"
     mo.vm.provision "file", source: "scripts/ubuntu/mongo-orchestration-config.json", destination: "mongo-orchestration-config.json"
     mo.vm.provision "shell", path: "scripts/ubuntu/mongo-orchestration.sh", privileged: true
     mo.vm.provision "shell", path: "scripts/ubuntu/ldap/install.sh", privileged: true

bin/prep-release.php

@@ -62,7 +62,7 @@ function get_files() {
         "scripts/centos/ldap/users",
         "scripts/presets/*.{json}",
         "scripts/ssl/*.pem",
-        "scripts/*.{php,sh}",
+        "scripts/*.{json,php,py,sh}",
         "tests/utils/*.{inc,json.gz,php}",
         "tests/**/*.{phpt}",
         ),

scripts/presets/replicaset-36.json

@@ -11,7 +11,7 @@
         "setParameter": {"enableTestCommands": 1}
     },
     "sslParams": {
-	"sslMode": "requireSSL",
+        "sslMode": "requireSSL",
         "sslCAFile": "/phongo/scripts/ssl/ca.pem",
         "sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
         "sslWeakCertificateValidation": true

scripts/presets/standalone-26.json

@@ -13,7 +13,7 @@
         "setParameter": {"enableTestCommands": 1, "authenticationMechanisms": "MONGODB-X509"}
     },
     "sslParams": {
-	"sslMode": "requireSSL",
+        "sslMode": "requireSSL",
         "sslCAFile": "/phongo/scripts/ssl/ca.pem",
         "sslPEMKeyFile": "/phongo/scripts/ssl/server.pem",
         "sslWeakCertificateValidation": true

scripts/presets/standalone-ssl.json

@@ -19,7 +19,6 @@ function lap() {
 $PRESETS = [
     "standalone" => [
         "scripts/presets/standalone.json",
-        "scripts/presets/standalone-26.json",
         "scripts/presets/standalone-30.json",
         "scripts/presets/standalone-ssl.json",
         "scripts/presets/standalone-auth.json",
@@ -29,7 +28,6 @@ function lap() {
     "replicasets" => [
         "scripts/presets/replicaset.json",
         "scripts/presets/replicaset-30.json",
-        "scripts/presets/replicaset-36.json",
         "scripts/presets/replicaset-dns.json",
     ],
 ];