mirror of https://github.com/ceph/ceph-ansible.git
Merge pull request #808 from jimcurtis/master
docker: Prefix OpenStack VM names to prevent collisionpull/809/head
commit
cac87416b8
|
@ -24,8 +24,11 @@ if BOX == 'openstack'
|
||||||
require 'vagrant-openstack-provider'
|
require 'vagrant-openstack-provider'
|
||||||
OSVM = true
|
OSVM = true
|
||||||
USER = settings['os_ssh_username']
|
USER = settings['os_ssh_username']
|
||||||
|
OSUSER = settings['os_username']
|
||||||
|
OSPREFIX = "#{OSUSER}-"
|
||||||
else
|
else
|
||||||
OSVM = false
|
OSVM = false
|
||||||
|
OSPREFIX = ""
|
||||||
end
|
end
|
||||||
|
|
||||||
ansible_provision = proc do |ansible|
|
ansible_provision = proc do |ansible|
|
||||||
|
@ -42,15 +45,15 @@ ansible_provision = proc do |ansible|
|
||||||
# these aren't supported by Vagrant, see
|
# these aren't supported by Vagrant, see
|
||||||
# https://github.com/mitchellh/vagrant/issues/3539
|
# https://github.com/mitchellh/vagrant/issues/3539
|
||||||
ansible.groups = {
|
ansible.groups = {
|
||||||
'mons' => (0..NMONS - 1).map { |j| "mon#{j}" },
|
'mons' => (0..NMONS - 1).map { |j| "#{OSPREFIX}mon#{j}" },
|
||||||
'osds' => (0..NOSDS - 1).map { |j| "osd#{j}" },
|
'osds' => (0..NOSDS - 1).map { |j| "#{OSPREFIX}osd#{j}" },
|
||||||
'mdss' => (0..NMDSS - 1).map { |j| "mds#{j}" },
|
'mdss' => (0..NMDSS - 1).map { |j| "#{OSPREFIX}mds#{j}" },
|
||||||
'rgws' => (0..NRGWS - 1).map { |j| "rgw#{j}" },
|
'rgws' => (0..NRGWS - 1).map { |j| "#{OSPREFIX}rgw#{j}" },
|
||||||
'clients' => (0..CLIENTS - 1).map { |j| "client#{j}" }
|
'clients' => (0..CLIENTS - 1).map { |j| "#{OSPREFIX}client#{j}" }
|
||||||
}
|
}
|
||||||
|
|
||||||
if RESTAPI then
|
if RESTAPI then
|
||||||
ansible.groups['restapis'] = (0..NMONS - 1).map { |j| "mon#{j}" }
|
ansible.groups['restapis'] = (0..NMONS - 1).map { |j| "#{OSPREFIX}mon#{j}" }
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
@ -65,6 +68,8 @@ ansible_provision = proc do |ansible|
|
||||||
ceph_mon_docker_interface: ETH,
|
ceph_mon_docker_interface: ETH,
|
||||||
ceph_mon_docker_subnet: "#{SUBNET}.0/24",
|
ceph_mon_docker_subnet: "#{SUBNET}.0/24",
|
||||||
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_JOURNAL_SIZE=100",
|
ceph_osd_docker_extra_env: "CEPH_DAEMON=OSD_CEPH_DISK,OSD_JOURNAL_SIZE=100",
|
||||||
|
cluster_network: "#{SUBNET}.0/24",
|
||||||
|
public_network: "#{SUBNET}.0/24",
|
||||||
ceph_osd_docker_devices: settings['disks'],
|
ceph_osd_docker_devices: settings['disks'],
|
||||||
# Note that OSVM is defaulted to false above
|
# Note that OSVM is defaulted to false above
|
||||||
ceph_docker_on_openstack: OSVM,
|
ceph_docker_on_openstack: OSVM,
|
||||||
|
@ -123,8 +128,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
(0..CLIENTS - 1).each do |i|
|
(0..CLIENTS - 1).each do |i|
|
||||||
config.vm.define "client#{i}" do |client|
|
config.vm.define "#{OSPREFIX}client#{i}" do |client|
|
||||||
client.vm.hostname = "ceph-client#{i}"
|
client.vm.hostname = "#{OSPREFIX}ceph-client#{i}"
|
||||||
if !OSVM
|
if !OSVM
|
||||||
client.vm.network :private_network, ip: "#{SUBNET}.4#{i}"
|
client.vm.network :private_network, ip: "#{SUBNET}.4#{i}"
|
||||||
end
|
end
|
||||||
|
@ -152,8 +157,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
(0..NRGWS - 1).each do |i|
|
(0..NRGWS - 1).each do |i|
|
||||||
config.vm.define "rgw#{i}" do |rgw|
|
config.vm.define "#{OSPREFIX}rgw#{i}" do |rgw|
|
||||||
rgw.vm.hostname = "ceph-rgw#{i}"
|
rgw.vm.hostname = "#{OSPREFIX}ceph-rgw#{i}"
|
||||||
if !OSVM
|
if !OSVM
|
||||||
rgw.vm.network :private_network, ip: "#{SUBNET}.5#{i}"
|
rgw.vm.network :private_network, ip: "#{SUBNET}.5#{i}"
|
||||||
end
|
end
|
||||||
|
@ -182,8 +187,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
(0..NMDSS - 1).each do |i|
|
(0..NMDSS - 1).each do |i|
|
||||||
config.vm.define "mds#{i}" do |mds|
|
config.vm.define "#{OSPREFIX}mds#{i}" do |mds|
|
||||||
mds.vm.hostname = "ceph-mds#{i}"
|
mds.vm.hostname = "#{OSPREFIX}ceph-mds#{i}"
|
||||||
if !OSVM
|
if !OSVM
|
||||||
mds.vm.network :private_network, ip: "#{SUBNET}.7#{i}"
|
mds.vm.network :private_network, ip: "#{SUBNET}.7#{i}"
|
||||||
end
|
end
|
||||||
|
@ -210,8 +215,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
(0..NMONS - 1).each do |i|
|
(0..NMONS - 1).each do |i|
|
||||||
config.vm.define "mon#{i}" do |mon|
|
config.vm.define "#{OSPREFIX}mon#{i}" do |mon|
|
||||||
mon.vm.hostname = "ceph-mon#{i}"
|
mon.vm.hostname = "#{OSPREFIX}ceph-mon#{i}"
|
||||||
if !OSVM
|
if !OSVM
|
||||||
mon.vm.network :private_network, ip: "#{SUBNET}.1#{i}"
|
mon.vm.network :private_network, ip: "#{SUBNET}.1#{i}"
|
||||||
end
|
end
|
||||||
|
@ -239,8 +244,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
|
||||||
end
|
end
|
||||||
|
|
||||||
(0..NOSDS - 1).each do |i|
|
(0..NOSDS - 1).each do |i|
|
||||||
config.vm.define "osd#{i}" do |osd|
|
config.vm.define "#{OSPREFIX}osd#{i}" do |osd|
|
||||||
osd.vm.hostname = "ceph-osd#{i}"
|
osd.vm.hostname = "#{OSPREFIX}ceph-osd#{i}"
|
||||||
if !OSVM
|
if !OSVM
|
||||||
osd.vm.network :private_network, ip: "#{SUBNET}.10#{i}"
|
osd.vm.network :private_network, ip: "#{SUBNET}.10#{i}"
|
||||||
osd.vm.network :private_network, ip: "#{SUBNET}.20#{i}"
|
osd.vm.network :private_network, ip: "#{SUBNET}.20#{i}"
|
||||||
|
|
Loading…
Reference in New Issue