From: Sébastien Han <seb@redhat.com>
Date: Tue, 8 Mar 2016 15:06:05 +0000 (+0100)
Subject: vagrant: add other boxes for centos and ubuntu
X-Git-Tag: v1.0.2~6^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F613%2Fhead;p=ceph-ansible.git

vagrant: add other boxes for centos and ubuntu

Signed-off-by: Sébastien Han <seb@redhat.com>
---

diff --git a/vagrant_variables.yml.sample b/vagrant_variables.yml.sample
index 7a161b89e..a9dd9d181 100644
--- a/vagrant_variables.yml.sample
+++ b/vagrant_variables.yml.sample
@@ -31,8 +31,8 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]"
 
 # VAGRANT BOX
 # Fedora: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
-# Ubuntu: ubuntu/trusty64
-# CentOS: bento/centos-7.1
+# Ubuntu: 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
 # Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller'