Merge pull request #489 from ceph/vagrant-virtualbox-updates

updates related to using vagrant and virtualbox for testing

README.md

@@ -7,7 +7,6 @@ Clone me:
 
 ```bash
 git clone https://github.com/ceph/ceph-ansible.git
-cp vagrant_variables.yml.sample vagrant_variables.yml
 ```
 
 ## What does it do?
@@ -32,12 +31,25 @@ More details:
 * A rolling upgrade playbook was written, an upgrade from Dumpling to Emperor was performed and worked.
 
 
-## Setup with Vagrant
+## Setup with Vagrant using virtualbox provider
 
-Run your virtual machines:
+* Create vagrant_variables.yml
 
-```bash
-$ vagrant up --provider=virtualbox
+```
+$ cp vagrant_variables.yml.sample vagrant_variables.yml
+```
+
+* Create site.yml
+
+```
+$ cp site.yml.sample site.yml
+```
+
+* Create VMs
+
+```
+$ vagrant up --no-provision --provider=virtualbox
+$ vagrant provision
 ...
 ...
 ...

Vagrantfile

@@ -43,6 +43,7 @@ ansible_provision = proc do |ansible|
     cluster_network: "#{SUBNET}.0/24",
     public_network: "#{SUBNET}.0/24",
     devices: settings['disks'],
+    os_tuning_params: settings['os_tuning_params']
   }
   ansible.limit = 'all'
 end

vagrant_variables.yml.sample

@@ -35,3 +35,7 @@ vagrant_box: ubuntu/trusty64
 
 # use vagrant_storagectl: 'SATA Controller' for CentOS
 vagrant_storagectl: 'SATAController'
+
+os_tuning_params:
+  - { name: kernel.pid_max, value: 4194303 }
+  - { name: fs.file-max, value: 26234859 }