Changes to allow for flexible rsync directory

-rsync directory was hardcoded previously and did not reflect the default /vagrant rsync directory

diff --git a/Vagrantfile b/Vagrantfile
index e3197c98ebc2c7325fdbff7a61210e9d6c883abd..5cf98d7c1add89bdf824774e759aed853d74e9cf 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -18,6 +18,7 @@ CLIENTS        = settings['client_vms']
 SUBNET         = settings['subnet']
 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']
@@ -112,7 +113,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
 
   # Faster bootup.  Disable if you need this for libvirt
   config.vm.provider :libvirt do |v,override|
-    override.vm.synced_folder '.', '/home/vagrant/sync', disabled: true
+    override.vm.synced_folder '.', SYNC_DIR, disabled: true
   end
 
   if BOX == 'openstack'

diff --git a/vagrant_variables.yml.atomic b/vagrant_variables.yml.atomic
index e0a0e9824545c0cbccbbc17b97a9ff044b9a3ab3..63ea2b2270ef9c50be8cc338c0d1bf2b4379e8aa 100644 (file)
--- a/vagrant_variables.yml.atomic
+++ b/vagrant_variables.yml.atomic
@@ -23,6 +23,9 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
 
 eth: 'enp0s8'
 vagrant_box: centos/atomic-host
+# 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
 
 # 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

diff --git a/vagrant_variables.yml.sample b/vagrant_variables.yml.sample
index 23c4ef26a66172b93c9ea987c00fb5eead227805..b7fb8a4919c6a5f101495d3d13c625ff6ae09ef3 100644 (file)
--- a/vagrant_variables.yml.sample
+++ b/vagrant_variables.yml.sample
@@ -44,6 +44,9 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
 #   - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
 #   - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
 vagrant_box: ubuntu/trusty64
+# 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
 # VAGRANT URL
 # This is a URL to download an image from an alternate location.  vagrant_box
 # above should be set to the filename of the image.