From: Leseb <seb@redhat.com>
Date: Thu, 13 Oct 2016 09:45:50 +0000 (+0900)
Subject: Merge pull request #1022 from jsaintrocc/vagrant-xenial
X-Git-Tag: v2.0~35
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=869c287331473eef02d9b9f4c8d35675c12b2bd8;p=ceph-ansible.git

Merge pull request #1022 from jsaintrocc/vagrant-xenial

Updated to use xenial by default.  Added OSD specific controller.
---

869c287331473eef02d9b9f4c8d35675c12b2bd8
diff --cc vagrant_variables.yml.sample
index b3a97b265,2433e2e06..7f46c2564
--- a/vagrant_variables.yml.sample
+++ b/vagrant_variables.yml.sample
@@@ -54,11 -55,8 +55,8 @@@ vagrant_sync_dir: /home/vagrant/syn
  # above should be set to the filename of the image.
  # Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
  # Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box
 -# vagrant_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 +# vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
  
- # 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 }