mirror of https://github.com/ceph/ceph-ansible.git
remove unsed ceph_rgw_civetweb_port variable
Signed-off-by: Sébastien Han <seb@redhat.com>pull/2450/head
parent
f119b25bbe
commit
8000ae342e
|
@ -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}",
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue