From: Sébastien Han Date: Tue, 2 Sep 2014 22:13:07 +0000 (+0200) Subject: Use a very unlikely subnet address for Vagrant X-Git-Tag: v1.0.0~328^2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83be67cd54ca3db3a4214e2f9bd255253f38c3ab;p=ceph-ansible.git 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 --- diff --git a/Vagrantfile b/Vagrantfile index f5227e342..d456c1aea 100644 --- 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 6a1de1908..128379d96 100644 --- 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