From 0570008718072dfd8bb6d49e0679e68d961c0cf7 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Mon, 17 Jul 2017 17:11:32 +0200 Subject: [PATCH] tests: Add a client node to docker scenario Signed-off-by: Guillaume Abrioux --- Vagrantfile | 2 ++ tests/functional/centos/7/docker/hosts | 3 +++ tests/functional/centos/7/docker/vagrant_variables.yml | 3 ++- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 9d274eb8c..3a48c1c3c 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -22,6 +22,7 @@ MGRS = settings['mgr_vms'] PUBLIC_SUBNET = settings['public_subnet'] CLUSTER_SUBNET = settings['cluster_subnet'] BOX = settings['vagrant_box'] +CLIENT_BOX = settings['client_vagrant_box'] || settings['vagrant_box'] BOX_URL = settings['vagrant_box_url'] SYNC_DIR = settings['vagrant_sync_dir'] MEMORY = settings['memory'] @@ -217,6 +218,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| (0..CLIENTS - 1).each do |i| config.vm.define "#{LABEL_PREFIX}client#{i}" do |client| + client.vm.box = CLIENT_BOX client.vm.hostname = "#{LABEL_PREFIX}ceph-client#{i}" if ASSIGN_STATIC_IP client.vm.network :private_network, diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/centos/7/docker/hosts index 2d684367d..9683f9760 100644 --- a/tests/functional/centos/7/docker/hosts +++ b/tests/functional/centos/7/docker/hosts @@ -14,3 +14,6 @@ rgw0 [mgrs] mgr0 + +[clients] +client0 diff --git a/tests/functional/centos/7/docker/vagrant_variables.yml b/tests/functional/centos/7/docker/vagrant_variables.yml index 5c4d1081f..56e9cfe4c 100644 --- a/tests/functional/centos/7/docker/vagrant_variables.yml +++ b/tests/functional/centos/7/docker/vagrant_variables.yml @@ -10,7 +10,7 @@ mds_vms: 1 rgw_vms: 1 nfs_vms: 0 rbd_mirror_vms: 1 -client_vms: 0 +client_vms: 1 iscsi_gw_vms: 0 mgr_vms: 1 @@ -46,6 +46,7 @@ disks: "[ '/dev/sda', '/dev/sdb' ]" # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ vagrant_box: centos/atomic-host +client_vagrant_box: centos/7 #ssh_private_key_path: "~/.ssh/id_rsa" # 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