Skip to content

Commit fad733b

Browse files
committed
vagrantfile: drop grafana group
this has never been used for real, let's drop this Signed-off-by: Guillaume Abrioux <[email protected]>
1 parent ac909cc commit fad733b

File tree

1 file changed

+0
-47
lines changed

1 file changed

+0
-47
lines changed

Diff for: Vagrantfile

-47
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ NOSDS = settings['osd_vms']
2121
NMDSS = settings['mds_vms']
2222
NRGWS = settings['rgw_vms']
2323
NNFSS = settings['nfs_vms']
24-
GRAFANA = settings['grafana_server_vms']
2524
NRBD_MIRRORS = settings['rbd_mirror_vms']
2625
CLIENTS = settings['client_vms']
2726
MGRS = settings['mgr_vms']
@@ -67,7 +66,6 @@ ansible_provision = proc do |ansible|
6766
'rbd_mirrors' => (0..NRBD_MIRRORS - 1).map { |j| "#{LABEL_PREFIX}rbd_mirror#{j}" },
6867
'clients' => (0..CLIENTS - 1).map { |j| "#{LABEL_PREFIX}client#{j}" },
6968
'mgrs' => (0..MGRS - 1).map { |j| "#{LABEL_PREFIX}mgr#{j}" },
70-
'monitoring' => (0..GRAFANA - 1).map { |j| "#{LABEL_PREFIX}grafana#{j}" }
7169
}
7270

7371
if IPV6 then
@@ -238,51 +236,6 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
238236
end
239237
end
240238

241-
(0..GRAFANA - 1).each do |i|
242-
config.vm.define "#{LABEL_PREFIX}grafana#{i}" do |grf|
243-
grf.vm.hostname = "#{LABEL_PREFIX}grafana#{i}"
244-
if ASSIGN_STATIC_IP && !IPV6
245-
grf.vm.network :private_network,
246-
:ip => "#{PUBLIC_SUBNET}.#{$last_ip_pub_digit+=1}"
247-
end
248-
# Virtualbox
249-
grf.vm.provider :virtualbox do |vb|
250-
vb.customize ['modifyvm', :id, '--memory', "#{MEMORY}"]
251-
end
252-
253-
# VMware
254-
grf.vm.provider :vmware_fusion do |v|
255-
v.vmx['memsize'] = "#{MEMORY}"
256-
end
257-
258-
# Libvirt
259-
grf.vm.provider :libvirt do |lv,override|
260-
lv.memory = MEMORY
261-
lv.random_hostname = true
262-
if IPV6 then
263-
override.vm.network :private_network,
264-
:libvirt__ipv6_address => "#{PUBLIC_SUBNET}",
265-
:libvirt__ipv6_prefix => "64",
266-
:libvirt__dhcp_enabled => false,
267-
:libvirt__forward_mode => "veryisolated",
268-
:libvirt__network_name => "ipv6-public-network",
269-
:ip => "#{PUBLIC_SUBNET}#{$last_ip_pub_digit+=1}",
270-
:netmask => "64"
271-
end
272-
end
273-
274-
# Parallels
275-
grf.vm.provider "parallels" do |prl|
276-
prl.name = "ceph-grafana#{i}"
277-
prl.memory = "#{MEMORY}"
278-
end
279-
280-
grf.vm.provider :linode do |provider|
281-
provider.label = grf.vm.hostname
282-
end
283-
end
284-
end
285-
286239
(0..MGRS - 1).each do |i|
287240
config.vm.define "#{LABEL_PREFIX}mgr#{i}" do |mgr|
288241
mgr.vm.hostname = "#{LABEL_PREFIX}mgr#{i}"

0 commit comments

Comments
 (0)