Use a very unlikely subnet address for Vagrant

Since 192.168.0.0/24 is very commong and might overlap with some
existing networks on your laptop, using another subnet like '42' is less
bound to happen.

Signed-off-by: Sébastien Han <sebastien.han@enovance.com>

diff --git a/Vagrantfile b/Vagrantfile
index f5227e3421eeb8ba790338d4576555f6f52eb630..d456c1aea69e5efc8c402db5b757f81be920dc80 100644 (file)
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -38,7 +38,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   config.vm.box = "hashicorp/precise64"
 
   config.vm.define :rgw do |rgw|
-    rgw.vm.network :private_network, ip: "192.168.0.2"
+    rgw.vm.network :private_network, ip: "192.168.42.2"
     rgw.vm.host_name = "ceph-rgw"
     rgw.vm.provider :virtualbox do |vb|
       vb.customize ["modifyvm", :id, "--memory", "192"]
@@ -51,7 +51,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   (0..NMONS-1).each do |i|
     config.vm.define "mon#{i}" do |mon|
       mon.vm.hostname = "ceph-mon#{i}"
-      mon.vm.network :private_network, ip: "192.168.0.1#{i}"
+      mon.vm.network :private_network, ip: "192.168.42.1#{i}"
       mon.vm.provider :virtualbox do |vb|
         vb.customize ["modifyvm", :id, "--memory", "192"]
       end
@@ -64,8 +64,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   (0..NOSDS-1).each do |i|
     config.vm.define "osd#{i}" do |osd|
       osd.vm.hostname = "ceph-osd#{i}"
-      osd.vm.network :private_network, ip: "192.168.0.10#{i}"
-      osd.vm.network :private_network, ip: "192.168.0.20#{i}"
+      osd.vm.network :private_network, ip: "192.168.42.10#{i}"
+      osd.vm.network :private_network, ip: "192.168.42.20#{i}"
       osd.vm.provider :virtualbox do |vb|
         (0..1).each do |d|
           vb.customize [ "createhd", "--filename", "disk-#{i}-#{d}", "--size", "11000" ]

diff --git a/roles/ceph-common/defaults/main.yml b/roles/ceph-common/defaults/main.yml
index 6a1de19080b25e99500c53d1d7624aa11bcd4740..128379d965ed46b9077c27c36b1cadc603f34e0c 100644 (file)
--- a/roles/ceph-common/defaults/main.yml
+++ b/roles/ceph-common/defaults/main.yml
@@ -41,8 +41,8 @@ pool_default_pg_num: 128
 pool_default_pgp_num: 128
 pool_default_size: 2
 pool_default_min_size: 1
-cluster_network: 192.168.0.0/24
-public_network: 192.168.0.0/24
+cluster_network: 192.168.42.0/24
+public_network: 192.168.42.0/24
 osd_mkfs_type: xfs
 osd_mkfs_options_xfs: -f -i size=2048
 osd_mount_options_xfs: noatime