ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tests: Add a client node to docker scenario 

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/1677/head
Guillaume Abrioux 2017-07-17 17:11:32 +02:00
parent 14d2d08340
commit 0570008718
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Vagrantfile vendored
View File

@ -22,6 +22,7 @@ MGRS = settings['mgr_vms']
PUBLIC_SUBNET = settings['public_subnet'] PUBLIC_SUBNET = settings['public_subnet']
CLUSTER_SUBNET = settings['cluster_subnet'] CLUSTER_SUBNET = settings['cluster_subnet']
BOX = settings['vagrant_box'] BOX = settings['vagrant_box']
CLIENT_BOX = settings['client_vagrant_box'] || settings['vagrant_box']
BOX_URL = settings['vagrant_box_url'] BOX_URL = settings['vagrant_box_url']
SYNC_DIR = settings['vagrant_sync_dir'] SYNC_DIR = settings['vagrant_sync_dir']
MEMORY = settings['memory'] MEMORY = settings['memory']
@ -217,6 +218,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
(0..CLIENTS - 1).each do |i| (0..CLIENTS - 1).each do |i|
config.vm.define "#{LABEL_PREFIX}client#{i}" do |client| config.vm.define "#{LABEL_PREFIX}client#{i}" do |client|
client.vm.box = CLIENT_BOX
client.vm.hostname = "#{LABEL_PREFIX}ceph-client#{i}" client.vm.hostname = "#{LABEL_PREFIX}ceph-client#{i}"
if ASSIGN_STATIC_IP if ASSIGN_STATIC_IP
client.vm.network :private_network, client.vm.network :private_network,

3
tests/functional/centos/7/docker/hosts
View File

@ -14,3 +14,6 @@ rgw0
[mgrs] [mgrs]
mgr0 mgr0
[clients]
client0

3
tests/functional/centos/7/docker/vagrant_variables.yml
View File

@ -10,7 +10,7 @@ mds_vms: 1
rgw_vms: 1 rgw_vms: 1
nfs_vms: 0 nfs_vms: 0
rbd_mirror_vms: 1 rbd_mirror_vms: 1
client_vms: 0 client_vms: 1
iscsi_gw_vms: 0 iscsi_gw_vms: 0
mgr_vms: 1 mgr_vms: 1
@ -46,6 +46,7 @@ disks: "[ '/dev/sda', '/dev/sdb' ]"
# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q=
# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/
vagrant_box: centos/atomic-host vagrant_box: centos/atomic-host
client_vagrant_box: centos/7
#ssh_private_key_path: "~/.ssh/id_rsa" #ssh_private_key_path: "~/.ssh/id_rsa"
# The sync directory changes based on vagrant box # The sync directory changes based on vagrant box
# Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant # Set to /home/vagrant/sync for Centos/7, /home/{ user }/vagrant for openstack and defaults to /vagrant