From 8000ae342e9482a49bae8615d70e599740978157 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 7 Mar 2018 17:26:24 +0100 Subject: [PATCH] remove unsed ceph_rgw_civetweb_port variable MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Sébastien Han --- Vagrantfile | 5 ++--- tests/functional/centos/7/docker-collocation/group_vars/all | 1 - 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 24176edcf..5984042e5 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -79,7 +79,6 @@ ansible_provision = proc do |ansible| ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24", devices: settings['disks'], ceph_docker_on_openstack: BOX == 'openstack', - ceph_rgw_civetweb_port: 8080, radosgw_interface: ETH, generate_fsid: 'true', }) @@ -480,13 +479,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| osd.vm.provider :virtualbox do |vb| # Create our own controller for consistency and to remove VM dependency unless File.exist?("disk-#{i}-0.vdi") - # Adding OSD Controller; + # Adding OSD Controller; # once the first disk is there assuming we don't need to do this vb.customize ['storagectl', :id, '--name', 'OSD Controller', '--add', 'scsi'] end - + (0..1).each do |d| vb.customize ['createhd', '--filename', "disk-#{i}-#{d}", diff --git a/tests/functional/centos/7/docker-collocation/group_vars/all b/tests/functional/centos/7/docker-collocation/group_vars/all index fb286460c..a58ea95e0 100644 --- a/tests/functional/centos/7/docker-collocation/group_vars/all +++ b/tests/functional/centos/7/docker-collocation/group_vars/all @@ -13,7 +13,6 @@ ceph_docker_on_openstack: False public_network: "192.168.15.0/24" cluster_network: "192.168.16.0/24" osd_scenario: collocated -ceph_rgw_civetweb_port: 8080 osd_objectstore: filestore # OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1 -- 2.39.5