Merge pull request #1022 from jsaintrocc/vagrant-xenial

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

Vagrantfile

@@ -25,7 +25,6 @@ BOX            = settings['vagrant_box']
 BOX_URL        = settings['vagrant_box_url']
 SYNC_DIR       = settings['vagrant_sync_dir']
 MEMORY         = settings['memory']
-STORAGECTL     = settings['vagrant_storagectl']
 ETH            = settings['eth']
 DOCKER         = settings['docker']
 USER           = settings['ssh_username']
@@ -418,15 +417,16 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
       end
       # Virtualbox
       osd.vm.provider :virtualbox do |vb|
+        # Create our own controller for consistency and to remove VM dependency
+        vb.customize ['storagectl', :id,
+                      '--name', 'OSD Controller',
+                      '--add', 'scsi']
         (0..1).each do |d|
           vb.customize ['createhd',
                         '--filename', "disk-#{i}-#{d}",
                         '--size', '11000'] unless File.exist?("disk-#{i}-#{d}.vdi")
-          # Controller names are dependent on the VM being built.
-          # It is set when the base box is made in our case ubuntu/trusty64.
-          # Be careful while changing the box.
           vb.customize ['storageattach', :id,
-                        '--storagectl', STORAGECTL,
+                        '--storagectl', 'OSD Controller',
                         '--port', 3 + d,
                         '--device', 0,
                         '--type', 'hdd',

vagrant_variables.yml.atomic

@@ -30,8 +30,4 @@ vagrant_box: centos/atomic-host
 # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
 vagrant_sync_dir: /home/vagrant/sync
 
-# if vagrant fails to attach storage controller, add the storage controller name by:
-# VBoxManage storagectl `VBoxManage list vms |grep ceph-ansible_osd0|awk '{print $1}'|tr \" ' '` --name "SATA" --add sata
-# and "vagrant up" again
-vagrant_storagectl: 'SATA'
 skip_tags: 'with_pkg'

vagrant_variables.yml.sample

@@ -26,18 +26,19 @@ cluster_subnet: 192.168.43
 
 # MEMORY
 # set 1024 for CentOS
-memory: 256
+memory: 512
 
 # Ethernet interface name
-# use eth1 for libvirt and ubuntu, enp0s8 for CentOS
+# use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
 eth: 'eth1'
 
 # Disks
 # For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
+# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
 disks: "[ '/dev/sdb', '/dev/sdc' ]"
 
 # VAGRANT BOX
-# Ubuntu: ubuntu/trusty64 or ubuntu/wily64
+# Ubuntu: bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64
 # CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet
 # libvirt CentOS: centos/7
 # parallels Ubuntu: parallels/ubuntu-14.04
@@ -45,7 +46,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
 # For more boxes have a look at:
 #   - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
 #   - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
-vagrant_box: ubuntu/trusty64
+vagrant_box: bento/ubuntu-16.04
 # The sync directory changes based on vagrant box
 # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant
 vagrant_sync_dir: /home/vagrant/sync
@@ -56,9 +57,6 @@ vagrant_sync_dir: /home/vagrant/sync
 # 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_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 }