ceph-volume: remove unused config from vagrant_variables.yml files

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
(cherry picked from commit 855ce630695ed9ca53c314b7e261ec3cc499787d)

diff --git a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml
index cbb34384216ba0456e78e573cc31bfad423ccdc2..7d1a4449a634c16cdb530f7794e0c840682139d3 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/centos7/create/vagrant_variables.yml
@@ -1,8 +1,5 @@
 ---
 
-# DEPLOY CONTAINERIZED DAEMONS
-docker: false
-
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
 osd_vms: 1
@@ -14,13 +11,6 @@ client_vms: 0
 iscsi_gw_vms: 0
 mgr_vms: 0
 
-# Deploy RESTAPI on each of the Monitors
-restapi: true
-
-# INSTALL SOURCE OF CEPH
-# valid values are 'stable' and 'dev'
-ceph_install_source: stable
-
 # SUBNETS TO USE FOR THE VMS
 public_subnet: 192.168.3
 cluster_subnet: 192.168.4
@@ -33,10 +23,6 @@ memory: 512
 # use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
 eth: 'eth1'
 
-# Disks
-# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
-# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
-disks: "[ '/dev/sdb', '/dev/sdc' ]"
 
 # VAGRANT BOX
 # Ceph boxes are *strongly* suggested. They are under better control and will
@@ -68,7 +54,3 @@ vagrant_disable_synced_folder: true
 # Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 # Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
-
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }

diff --git a/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml
index 2e5df09ab4d5a066bc205e492f5e0c6cd877bc1f..82b330ef9fe9ceb116343453c9a000079bdff5cd 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/xenial/create/vagrant_variables.yml
@@ -1,8 +1,4 @@
 ---
-
-# DEPLOY CONTAINERIZED DAEMONS
-docker: false
-
 # DEFINE THE NUMBER OF VMS TO RUN
 mon_vms: 1
 osd_vms: 1
@@ -14,13 +10,6 @@ client_vms: 0
 iscsi_gw_vms: 0
 mgr_vms: 0
 
-# Deploy RESTAPI on each of the Monitors
-restapi: true
-
-# INSTALL SOURCE OF CEPH
-# valid values are 'stable' and 'dev'
-ceph_install_source: stable
-
 # SUBNETS TO USE FOR THE VMS
 public_subnet: 192.168.3
 cluster_subnet: 192.168.4
@@ -33,11 +22,6 @@ memory: 512
 # use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial
 eth: 'eth1'
 
-# Disks
-# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]"
-# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]"
-disks: "[ '/dev/sdb', '/dev/sdc' ]"
-
 # VAGRANT BOX
 # Ceph boxes are *strongly* suggested. They are under better control and will
 # not get updated frequently unless required for build systems. These are (for
@@ -68,7 +52,3 @@ vagrant_disable_synced_folder: true
 # Fedora virtualbox: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
 # Fedora libvirt: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-libvirt.box
 # vagrant_box_url: https://download.fedoraproject.org/pub/fedora/linux/releases/22/Cloud/x86_64/Images/Fedora-Cloud-Base-Vagrant-22-20150521.x86_64.vagrant-virtualbox.box
-
-os_tuning_params:
-  - { name: kernel.pid_max, value: 4194303 }
-  - { name: fs.file-max, value: 26234859 }