]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Merge pull request #1022 from jsaintrocc/vagrant-xenial
authorLeseb <seb@redhat.com>
Thu, 13 Oct 2016 09:45:50 +0000 (18:45 +0900)
committerGitHub <noreply@github.com>
Thu, 13 Oct 2016 09:45:50 +0000 (18:45 +0900)
Updated to use xenial by default.  Added OSD specific controller.

1  2 
vagrant_variables.yml.sample

index b3a97b2655a93ed5d4bff31c75050bbacb185bb1,2433e2e06aa516c6e5ca0cadd5d762599ab57b5d..7f46c25642f80b573171f025489ff787207bcded
@@@ -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 }