Skip to content

Upgrade vm to trusty64 and revise install for pip and mo #728

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jan 8, 2018
Merged

Upgrade vm to trusty64 and revise install for pip and mo #728

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
34e23e9
Fix whitespace
jmikola Jan 4, 2018
9f9fe60
Add missing json MO config to PECL package
jmikola Jan 7, 2018
9812d67
Upgrade VM to trusty64 and revise mo installation
jmikola Jan 7, 2018
6ca8c7f
Remove redundant REPLICASET_36 mo environment
jmikola Jan 7, 2018
f21ef4d
Add REPLICASET_DNS to basic.inc servers array
jmikola Jan 7, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion CONTRIBUTING.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:toor@192.168.112.10:2200\/?authSource=admin",
Expand Down
7 changes: 2 additions & 5 deletions Vagrantfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/prep-release.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note: json contains the mongo orchestration config and should have been included long ago.

"tests/utils/*.{inc,json.gz,php}",
"tests/**/*.{phpt}",
),
Expand Down
71 changes: 0 additions & 71 deletions scripts/presets/replicaset-36.json
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions scripts/presets/standalone-26.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion scripts/presets/standalone-ssl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion scripts/presets/standalone-x509.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions scripts/start-servers.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
],
];
Expand Down
Loading