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

remove unsed ceph_rgw_civetweb_port variable 

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2450/head
Sébastien Han 2018-03-07 17:26:24 +01:00 committed by Guillaume Abrioux
parent f119b25bbe
commit 8000ae342e
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Vagrantfile vendored
View File

@ -79,7 +79,6 @@ ansible_provision = proc do |ansible|
ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24", ceph_mon_docker_subnet: "#{PUBLIC_SUBNET}.0/24",
devices: settings['disks'], devices: settings['disks'],
ceph_docker_on_openstack: BOX == 'openstack', ceph_docker_on_openstack: BOX == 'openstack',
ceph_rgw_civetweb_port: 8080,
radosgw_interface: ETH, radosgw_interface: ETH,
generate_fsid: 'true', generate_fsid: 'true',
}) })
@ -480,13 +479,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
osd.vm.provider :virtualbox do |vb| osd.vm.provider :virtualbox do |vb|
# Create our own controller for consistency and to remove VM dependency # Create our own controller for consistency and to remove VM dependency
unless File.exist?("disk-#{i}-0.vdi") 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 # once the first disk is there assuming we don't need to do this
vb.customize ['storagectl', :id, vb.customize ['storagectl', :id,
'--name', 'OSD Controller', '--name', 'OSD Controller',
'--add', 'scsi'] '--add', 'scsi']
end end
(0..1).each do |d| (0..1).each do |d|
vb.customize ['createhd', vb.customize ['createhd',
'--filename', "disk-#{i}-#{d}", '--filename', "disk-#{i}-#{d}",

1
tests/functional/centos/7/docker-collocation/group_vars/all
View File

@ -13,7 +13,6 @@ ceph_docker_on_openstack: False
public_network: "192.168.15.0/24" public_network: "192.168.15.0/24"
cluster_network: "192.168.16.0/24" cluster_network: "192.168.16.0/24"
osd_scenario: collocated osd_scenario: collocated
ceph_rgw_civetweb_port: 8080
osd_objectstore: filestore osd_objectstore: filestore
# OSD_FORCE_ZAP is only for Jewel, the function does not exist anymore on Luminous and above # 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 ceph_osd_docker_prepare_env: -e OSD_JOURNAL_SIZE={{ journal_size }} -e OSD_FORCE_ZAP=1