diff --git a/Vagrantfile b/Vagrantfile index ea2c5983b..3f8e2597b 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -20,8 +20,8 @@ NISCSI_GWS = settings['iscsi_gw_vms'] 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 = ENV['CEPH_ANSIBLE_VAGRANT_BOX'] || settings['vagrant_box'] +CLIENT_BOX = settings['client_vagrant_box'] || BOX BOX_URL = settings['vagrant_box_url'] SYNC_DIR = settings['vagrant_sync_dir'] MEMORY = settings['memory'] diff --git a/tests/functional/add-osds/Vagrantfile b/tests/functional/add-osds/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/add-osds/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/add-osds/ceph-override.json b/tests/functional/add-osds/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/add-osds/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/add-osds/container/Vagrantfile b/tests/functional/add-osds/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/add-osds/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/add-osds/container/ceph-override.json b/tests/functional/add-osds/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/add-osds/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/add-osds-container/group_vars/all b/tests/functional/add-osds/container/group_vars/all similarity index 76% rename from tests/functional/centos/7/add-osds-container/group_vars/all rename to tests/functional/add-osds/container/group_vars/all index 9b1a6c3a5..7ba959aff 100644 --- a/tests/functional/centos/7/add-osds-container/group_vars/all +++ b/tests/functional/add-osds/container/group_vars/all @@ -14,10 +14,15 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: global: osd_pool_default_size: 1 +ceph_osd_docker_run_script_path: /var/tmp \ No newline at end of file diff --git a/tests/functional/centos/7/add-osds-container/hosts b/tests/functional/add-osds/container/hosts similarity index 100% rename from tests/functional/centos/7/add-osds-container/hosts rename to tests/functional/add-osds/container/hosts diff --git a/tests/functional/centos/7/add-osds-container/hosts-2 b/tests/functional/add-osds/container/hosts-2 similarity index 100% rename from tests/functional/centos/7/add-osds-container/hosts-2 rename to tests/functional/add-osds/container/hosts-2 diff --git a/tests/functional/centos/7/add-osds-container/vagrant_variables.yml b/tests/functional/add-osds/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/add-osds-container/vagrant_variables.yml rename to tests/functional/add-osds/container/vagrant_variables.yml diff --git a/tests/functional/centos/7/add-osds/group_vars/all b/tests/functional/add-osds/group_vars/all similarity index 79% rename from tests/functional/centos/7/add-osds/group_vars/all rename to tests/functional/add-osds/group_vars/all index 6896bd97e..0ac99d0ca 100644 --- a/tests/functional/centos/7/add-osds/group_vars/all +++ b/tests/functional/add-osds/group_vars/all @@ -12,8 +12,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/centos/7/add-osds/hosts b/tests/functional/add-osds/hosts similarity index 100% rename from tests/functional/centos/7/add-osds/hosts rename to tests/functional/add-osds/hosts diff --git a/tests/functional/centos/7/add-osds/hosts-2 b/tests/functional/add-osds/hosts-2 similarity index 100% rename from tests/functional/centos/7/add-osds/hosts-2 rename to tests/functional/add-osds/hosts-2 diff --git a/tests/functional/centos/7/add-osds/vagrant_variables.yml b/tests/functional/add-osds/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/add-osds/vagrant_variables.yml rename to tests/functional/add-osds/vagrant_variables.yml diff --git a/tests/functional/all_daemons/Vagrantfile b/tests/functional/all_daemons/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/all_daemons/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/ceph-override.json b/tests/functional/all_daemons/ceph-override.json similarity index 100% rename from tests/functional/centos/7/cluster/ceph-override.json rename to tests/functional/all_daemons/ceph-override.json diff --git a/tests/functional/all_daemons/container/Vagrantfile b/tests/functional/all_daemons/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/all_daemons/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/all_daemons/container/ceph-override.json b/tests/functional/all_daemons/container/ceph-override.json new file mode 100644 index 000000000..cce7e62e8 --- /dev/null +++ b/tests/functional/all_daemons/container/ceph-override.json @@ -0,0 +1,21 @@ +{ + "ceph_conf_overrides": { + "global": { + "osd_pool_default_pg_num": 12, + "osd_pool_default_size": 1 + } + }, + "cephfs_pools": [ + { + "name": "cephfs_metadata", + "pgs": 8, + "size": 1 + }, + { + "name": "cephfs_data", + "pgs": 8, + "size": 1 + } + ], + "ceph_mon_docker_memory_limit": "2g" +} diff --git a/tests/functional/centos/7/docker/group_vars/all b/tests/functional/all_daemons/container/group_vars/all similarity index 100% rename from tests/functional/centos/7/docker/group_vars/all rename to tests/functional/all_daemons/container/group_vars/all diff --git a/tests/functional/centos/7/docker/group_vars/clients b/tests/functional/all_daemons/container/group_vars/clients similarity index 100% rename from tests/functional/centos/7/docker/group_vars/clients rename to tests/functional/all_daemons/container/group_vars/clients diff --git a/tests/functional/centos/7/docker/group_vars/iscsigws b/tests/functional/all_daemons/container/group_vars/iscsigws similarity index 100% rename from tests/functional/centos/7/docker/group_vars/iscsigws rename to tests/functional/all_daemons/container/group_vars/iscsigws diff --git a/tests/functional/centos/7/docker/group_vars/mons b/tests/functional/all_daemons/container/group_vars/mons similarity index 100% rename from tests/functional/centos/7/docker/group_vars/mons rename to tests/functional/all_daemons/container/group_vars/mons diff --git a/tests/functional/centos/7/docker/group_vars/osds b/tests/functional/all_daemons/container/group_vars/osds similarity index 100% rename from tests/functional/centos/7/docker/group_vars/osds rename to tests/functional/all_daemons/container/group_vars/osds diff --git a/tests/functional/centos/7/docker/group_vars/rgws b/tests/functional/all_daemons/container/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/docker/group_vars/rgws rename to tests/functional/all_daemons/container/group_vars/rgws diff --git a/tests/functional/centos/7/docker/hosts b/tests/functional/all_daemons/container/hosts similarity index 98% rename from tests/functional/centos/7/docker/hosts rename to tests/functional/all_daemons/container/hosts index fecf55a54..bdb0141a7 100644 --- a/tests/functional/centos/7/docker/hosts +++ b/tests/functional/all_daemons/container/hosts @@ -4,7 +4,7 @@ mon1 mon2 [mgrs] -mgr0 +mon0 [osds] osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" diff --git a/tests/functional/centos/7/docker/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml similarity index 98% rename from tests/functional/centos/7/docker/vagrant_variables.yml rename to tests/functional/all_daemons/container/vagrant_variables.yml index 81d5cc7aa..368381bd4 100644 --- a/tests/functional/centos/7/docker/vagrant_variables.yml +++ b/tests/functional/all_daemons/container/vagrant_variables.yml @@ -9,9 +9,9 @@ osd_vms: 2 mds_vms: 1 rgw_vms: 1 nfs_vms: 0 -rbd_mirror_vms: 1 +rbd_mirror_vms: 0 client_vms: 2 -iscsi_gw_vms: 1 +iscsi_gw_vms: 0 mgr_vms: 1 # Deploy RESTAPI on each of the Monitors diff --git a/tests/functional/centos/7/cluster/group_vars/all b/tests/functional/all_daemons/group_vars/all similarity index 82% rename from tests/functional/centos/7/cluster/group_vars/all rename to tests/functional/all_daemons/group_vars/all index e5342684a..5e11a1ce7 100644 --- a/tests/functional/centos/7/cluster/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -7,10 +7,6 @@ radosgw_interface: eth1 ceph_conf_overrides: global: osd_pool_default_size: 1 -nfs_ganesha_stable: true -nfs_ganesha_dev: false -nfs_ganesha_stable_branch: V2.5-stable -nfs_ganesha_flavor: "ceph_master" openstack_config: True openstack_glance_pool: name: "images" @@ -32,4 +28,4 @@ openstack_cinder_pool: size: 1 openstack_pools: - "{{ openstack_glance_pool }}" - - "{{ openstack_cinder_pool }}" + - "{{ openstack_cinder_pool }}" \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/group_vars/clients b/tests/functional/all_daemons/group_vars/clients similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/clients rename to tests/functional/all_daemons/group_vars/clients diff --git a/tests/functional/centos/7/cluster/group_vars/iscsigws b/tests/functional/all_daemons/group_vars/iscsigws similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/iscsigws rename to tests/functional/all_daemons/group_vars/iscsigws diff --git a/tests/functional/centos/7/cluster/group_vars/mons b/tests/functional/all_daemons/group_vars/mons similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/mons rename to tests/functional/all_daemons/group_vars/mons diff --git a/tests/functional/centos/7/cluster/group_vars/nfss b/tests/functional/all_daemons/group_vars/nfss similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/nfss rename to tests/functional/all_daemons/group_vars/nfss diff --git a/tests/functional/centos/7/cluster/group_vars/osds b/tests/functional/all_daemons/group_vars/osds similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/osds rename to tests/functional/all_daemons/group_vars/osds diff --git a/tests/functional/centos/7/cluster/group_vars/rgws b/tests/functional/all_daemons/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/cluster/group_vars/rgws rename to tests/functional/all_daemons/group_vars/rgws diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts new file mode 100644 index 000000000..26b6b4e7a --- /dev/null +++ b/tests/functional/all_daemons/hosts @@ -0,0 +1,36 @@ +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[mgrs] +mon0 + +[osds] +osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" +osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" + +[mdss] +mds0 + +[rgws] +rgw0 + +[clients] +client0 +client1 + +#[nfss] +#nfs0 + +[rbdmirrors] +rbd-mirror0 + +[iscsigws] +iscsi-gw0 ceph_repository="dev" + +[all:vars] +nfs_ganesha_stable=True +nfs_ganesha_dev=False +nfs_ganesha_stable_branch="V2.5-stable" +nfs_ganesha_flavor="ceph_master" \ No newline at end of file diff --git a/tests/functional/all_daemons/hosts-switch-to-containers b/tests/functional/all_daemons/hosts-switch-to-containers new file mode 100644 index 000000000..37b2d2156 --- /dev/null +++ b/tests/functional/all_daemons/hosts-switch-to-containers @@ -0,0 +1,22 @@ +[all:vars] +docker=True + +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[mgrs] +mon0 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 + +[clients] +client0 diff --git a/tests/functional/all_daemons/hosts-ubuntu b/tests/functional/all_daemons/hosts-ubuntu new file mode 100644 index 000000000..6c2dff187 --- /dev/null +++ b/tests/functional/all_daemons/hosts-ubuntu @@ -0,0 +1,38 @@ +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[mgrs] +mon0 + +[osds] +osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" +osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" + +[mdss] +mds0 + +[rgws] +rgw0 + +[clients] +client0 +client1 + +#[nfss] +#nfs0 + +[rbdmirrors] +rbd-mirror0 + +[iscsigws] +iscsi-gw0 ceph_repository="dev" + +[all:vars] +debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse'] +nfs_ganesha_stable=True +nfs_ganesha_stable_branch="V2.5-stable" +nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" +nfs_ganesha_dev=False +nfs_ganesha_flavor="ceph_master" \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml similarity index 96% rename from tests/functional/centos/7/cluster/vagrant_variables.yml rename to tests/functional/all_daemons/vagrant_variables.yml index 17a7e451e..c1301ed30 100644 --- a/tests/functional/centos/7/cluster/vagrant_variables.yml +++ b/tests/functional/all_daemons/vagrant_variables.yml @@ -12,10 +12,7 @@ nfs_vms: 0 rbd_mirror_vms: 1 client_vms: 2 iscsi_gw_vms: 1 -mgr_vms: 1 - -# Deploy RESTAPI on each of the Monitors -restapi: true +mgr_vms: 0 # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' @@ -73,4 +70,4 @@ os_tuning_params: - { name: fs.file-max, value: 26234859 } # VM prefix name, need to match the hostname -label_prefix: ceph +# label_prefix: ceph diff --git a/tests/functional/bs-lvm-osds/Vagrantfile b/tests/functional/bs-lvm-osds/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/bs-lvm-osds/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/bs-lvm-osds/ceph-override.json b/tests/functional/bs-lvm-osds/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/bs-lvm-osds/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/bs-lvm-osds/container/Vagrantfile b/tests/functional/bs-lvm-osds/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/bs-lvm-osds/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/bs-lvm-osds/container/ceph-override.json b/tests/functional/bs-lvm-osds/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/bs-lvm-osds/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds-container/group_vars/all b/tests/functional/bs-lvm-osds/container/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-lvm-osds-container/group_vars/all rename to tests/functional/bs-lvm-osds/container/group_vars/all diff --git a/tests/functional/centos/7/bs-lvm-osds-container/hosts b/tests/functional/bs-lvm-osds/container/hosts similarity index 100% rename from tests/functional/centos/7/bs-lvm-osds-container/hosts rename to tests/functional/bs-lvm-osds/container/hosts diff --git a/tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml b/tests/functional/bs-lvm-osds/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-lvm-osds-container/vagrant_variables.yml rename to tests/functional/bs-lvm-osds/container/vagrant_variables.yml diff --git a/tests/functional/centos/7/bs-lvm-osds/group_vars/all b/tests/functional/bs-lvm-osds/group_vars/all similarity index 100% rename from tests/functional/centos/7/bs-lvm-osds/group_vars/all rename to tests/functional/bs-lvm-osds/group_vars/all diff --git a/tests/functional/centos/7/bs-lvm-osds/hosts b/tests/functional/bs-lvm-osds/hosts similarity index 100% rename from tests/functional/centos/7/bs-lvm-osds/hosts rename to tests/functional/bs-lvm-osds/hosts diff --git a/tests/functional/centos/7/bs-lvm-osds/vagrant_variables.yml b/tests/functional/bs-lvm-osds/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/bs-lvm-osds/vagrant_variables.yml rename to tests/functional/bs-lvm-osds/vagrant_variables.yml diff --git a/tests/functional/centos/7/add-osds-container/ceph-override.json b/tests/functional/centos/7/add-osds-container/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/add-osds-container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/add-osds/Vagrantfile b/tests/functional/centos/7/add-osds/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/add-osds/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/add-osds/ceph-override.json b/tests/functional/centos/7/add-osds/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/add-osds/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile b/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-lvm-osds-container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json b/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/bs-lvm-osds-container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds/Vagrantfile b/tests/functional/centos/7/bs-lvm-osds/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/bs-lvm-osds/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/bs-lvm-osds/ceph-override.json b/tests/functional/centos/7/bs-lvm-osds/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/bs-lvm-osds/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/Vagrantfile b/tests/functional/centos/7/cluster/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/cluster/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/cluster/hosts b/tests/functional/centos/7/cluster/hosts deleted file mode 100644 index f5c517794..000000000 --- a/tests/functional/centos/7/cluster/hosts +++ /dev/null @@ -1,30 +0,0 @@ -[mons] -ceph-mon0 monitor_address=192.168.1.10 -ceph-mon1 monitor_interface=eth1 -ceph-mon2 monitor_address=192.168.1.12 - -[mgrs] -ceph-mgr0 - -[osds] -ceph-osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'ceph-osd0' }" -ceph-osd1 osd_crush_location="{ 'root': 'default', 'host': 'ceph-osd1' }" - -[mdss] -ceph-mds0 - -[rgws] -ceph-rgw0 - -[clients] -ceph-client0 -ceph-client1 - -#[nfss] -#ceph-nfs0 - -[rbdmirrors] -ceph-rbd-mirror0 - -[iscsigws] -ceph-iscsi-gw0 ceph_repository="dev" diff --git a/tests/functional/centos/7/cluster/hosts-switch-to-containers b/tests/functional/centos/7/cluster/hosts-switch-to-containers deleted file mode 100644 index 85f592c42..000000000 --- a/tests/functional/centos/7/cluster/hosts-switch-to-containers +++ /dev/null @@ -1,22 +0,0 @@ -[all:vars] -docker=True - -[mons] -ceph-mon0 monitor_address=192.168.1.10 -ceph-mon1 monitor_interface=eth1 -ceph-mon2 monitor_address=192.168.1.12 - -[osds] -ceph-osd0 - -[mdss] -ceph-mds0 - -[rgws] -ceph-rgw0 - -[clients] -ceph-client0 - -[mgrs] -ceph-mgr0 diff --git a/tests/functional/centos/7/docker-collocation/Vagrantfile b/tests/functional/centos/7/docker-collocation/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/docker-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker-collocation/ceph-override.json b/tests/functional/centos/7/docker-collocation/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/docker-collocation/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/docker/Vagrantfile b/tests/functional/centos/7/docker/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/docker/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/docker/ceph-override.json b/tests/functional/centos/7/docker/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/docker/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/infra_lv_create/Vagrantfile b/tests/functional/centos/7/infra_lv_create/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/infra_lv_create/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-batch-container/Vagrantfile b/tests/functional/centos/7/lvm-batch-container/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/lvm-batch-container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-batch/Vagrantfile b/tests/functional/centos/7/lvm-batch/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/lvm-batch/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds-container/Vagrantfile b/tests/functional/centos/7/lvm-osds-container/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/lvm-osds-container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds-container/ceph-override.json b/tests/functional/centos/7/lvm-osds-container/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/lvm-osds-container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds/Vagrantfile b/tests/functional/centos/7/lvm-osds/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/lvm-osds/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds/ceph-override.json b/tests/functional/centos/7/lvm-osds/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/lvm-osds/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/ooo-collocation/Vagrantfile b/tests/functional/centos/7/ooo-collocation/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/ooo-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/ooo-collocation/ceph-override.json b/tests/functional/centos/7/ooo-collocation/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/ooo-collocation/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite-container/Vagrantfile b/tests/functional/centos/7/rgw-multisite-container/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/rgw-multisite-container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite-container/ceph-override.json b/tests/functional/centos/7/rgw-multisite-container/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/rgw-multisite-container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/Vagrantfile b/tests/functional/centos/7/rgw-multisite-container/secondary/Vagrantfile deleted file mode 120000 index 9797e1cb7..000000000 --- a/tests/functional/centos/7/rgw-multisite-container/secondary/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite/Vagrantfile b/tests/functional/centos/7/rgw-multisite/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/rgw-multisite/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite/ceph-override.json b/tests/functional/centos/7/rgw-multisite/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/rgw-multisite/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite/secondary/Vagrantfile b/tests/functional/centos/7/rgw-multisite/secondary/Vagrantfile deleted file mode 120000 index 9797e1cb7..000000000 --- a/tests/functional/centos/7/rgw-multisite/secondary/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/shrink_osd/Vagrantfile b/tests/functional/centos/7/shrink_osd/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/shrink_osd/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/shrink_osd/hosts b/tests/functional/centos/7/shrink_osd/hosts deleted file mode 100644 index d3b2c1f81..000000000 --- a/tests/functional/centos/7/shrink_osd/hosts +++ /dev/null @@ -1,10 +0,0 @@ -[mons] -ceph-mon0 monitor_address=192.168.71.10 - -[mgrs] -ceph-mon0 - -[osds] -ceph-osd0 -ceph-osd1 -ceph-osd2 diff --git a/tests/functional/centos/7/shrink_osd_container/Vagrantfile b/tests/functional/centos/7/shrink_osd_container/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/centos/7/shrink_osd_container/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/shrink_osd_container/ceph-override.json b/tests/functional/centos/7/shrink_osd_container/ceph-override.json deleted file mode 120000 index 775cb006a..000000000 --- a/tests/functional/centos/7/shrink_osd_container/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../cluster/ceph-override.json \ No newline at end of file diff --git a/tests/functional/collocation/Vagrantfile b/tests/functional/collocation/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/collocation/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/collocation/ceph-override.json b/tests/functional/collocation/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/collocation/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/collocation/container/Vagrantfile b/tests/functional/collocation/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/collocation/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/collocation/container/ceph-override.json b/tests/functional/collocation/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/collocation/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/docker-collocation/group_vars/all b/tests/functional/collocation/container/group_vars/all similarity index 100% rename from tests/functional/centos/7/docker-collocation/group_vars/all rename to tests/functional/collocation/container/group_vars/all diff --git a/tests/functional/centos/7/docker-collocation/group_vars/clients b/tests/functional/collocation/container/group_vars/clients similarity index 100% rename from tests/functional/centos/7/docker-collocation/group_vars/clients rename to tests/functional/collocation/container/group_vars/clients diff --git a/tests/functional/centos/7/docker-collocation/group_vars/osds b/tests/functional/collocation/container/group_vars/osds similarity index 100% rename from tests/functional/centos/7/docker-collocation/group_vars/osds rename to tests/functional/collocation/container/group_vars/osds diff --git a/tests/functional/centos/7/docker-collocation/group_vars/rgws b/tests/functional/collocation/container/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/docker-collocation/group_vars/rgws rename to tests/functional/collocation/container/group_vars/rgws diff --git a/tests/functional/centos/7/docker-collocation/hosts b/tests/functional/collocation/container/hosts similarity index 100% rename from tests/functional/centos/7/docker-collocation/hosts rename to tests/functional/collocation/container/hosts diff --git a/tests/functional/centos/7/docker-collocation/vagrant_variables.yml b/tests/functional/collocation/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/docker-collocation/vagrant_variables.yml rename to tests/functional/collocation/container/vagrant_variables.yml diff --git a/tests/functional/collocation/group_vars/all b/tests/functional/collocation/group_vars/all new file mode 100644 index 000000000..48cb5d74a --- /dev/null +++ b/tests/functional/collocation/group_vars/all @@ -0,0 +1,14 @@ +--- +containerized_deployment: False +monitor_interface: eth1 +radosgw_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +ceph_docker_on_openstack: False +public_network: "192.168.15.0/24" +cluster_network: "192.168.16.0/24" +rgw_override_bucket_index_max_shards: 16 +rgw_bucket_default_quota_max_objects: 1638400 +ceph_conf_overrides: + global: + osd_pool_default_pg_num: 8 + osd_pool_default_size: 1 \ No newline at end of file diff --git a/tests/functional/collocation/group_vars/clients b/tests/functional/collocation/group_vars/clients new file mode 100644 index 000000000..1131a16c5 --- /dev/null +++ b/tests/functional/collocation/group_vars/clients @@ -0,0 +1,21 @@ +--- +user_config: True +test: + name: "test" + pg_num: "{{ osd_pool_default_pg_num }}" + pgp_num: "{{ osd_pool_default_pg_num }}" + rule_name: "HDD" + type: 1 + erasure_profile: "" + expected_num_objects: "" +test2: + name: "test2" + pg_num: "{{ osd_pool_default_pg_num }}" + pgp_num: "{{ osd_pool_default_pg_num }}" + rule_name: "HDD" + type: 1 + erasure_profile: "" + expected_num_objects: "" +pools: + - "{{ test }}" + - "{{ test2 }}" diff --git a/tests/functional/collocation/group_vars/osds b/tests/functional/collocation/group_vars/osds new file mode 100644 index 000000000..988ec50e2 --- /dev/null +++ b/tests/functional/collocation/group_vars/osds @@ -0,0 +1,11 @@ +--- +ceph_osd_docker_run_script_path: /var/tmp +osd_scenario: lvm +osd_objectstore: "bluestore" +lvm_volumes: + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals \ No newline at end of file diff --git a/tests/functional/collocation/group_vars/rgws b/tests/functional/collocation/group_vars/rgws new file mode 100644 index 000000000..265d18208 --- /dev/null +++ b/tests/functional/collocation/group_vars/rgws @@ -0,0 +1,6 @@ +--- +rgw_create_pools: + foo: + pg_num: 17 + bar: + pg_num: 19 \ No newline at end of file diff --git a/tests/functional/collocation/hosts b/tests/functional/collocation/hosts new file mode 100644 index 000000000..c7d3d34c6 --- /dev/null +++ b/tests/functional/collocation/hosts @@ -0,0 +1,23 @@ +[mons] +mon0 +mon1 +mon2 + +[osds] +osd0 + +[mdss] +mds0 +rgw0 + +[rgws] +rgw0 +mds0 + +[rbdmirrors] +rgw0 +mds0 + +#[nfss] +#rgw0 +#mds0 diff --git a/tests/functional/collocation/vagrant_variables.yml b/tests/functional/collocation/vagrant_variables.yml new file mode 100644 index 000000000..a8268a5b6 --- /dev/null +++ b/tests/functional/collocation/vagrant_variables.yml @@ -0,0 +1,56 @@ +--- +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 3 +osd_vms: 1 +mds_vms: 1 +rgw_vms: 1 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 0 + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.15 +cluster_subnet: 192.168.16 + +# MEMORY +# set 1024 for CentOS +memory: 1024 + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sda', '/dev/sdb' ]" + +# 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 +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= +# - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ +vagrant_box: centos/7 +# 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 +#vagrant_sync_dir: /home/vagrant/sync +#vagrant_sync_dir: / +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# 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 diff --git a/tests/functional/infra_lv_create/Vagrantfile b/tests/functional/infra_lv_create/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/infra_lv_create/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/infra_lv_create/group_vars/all b/tests/functional/infra_lv_create/group_vars/all similarity index 100% rename from tests/functional/centos/7/infra_lv_create/group_vars/all rename to tests/functional/infra_lv_create/group_vars/all diff --git a/tests/functional/centos/7/infra_lv_create/hosts b/tests/functional/infra_lv_create/hosts similarity index 100% rename from tests/functional/centos/7/infra_lv_create/hosts rename to tests/functional/infra_lv_create/hosts diff --git a/tests/functional/centos/7/infra_lv_create/vagrant_variables.yml b/tests/functional/infra_lv_create/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/infra_lv_create/vagrant_variables.yml rename to tests/functional/infra_lv_create/vagrant_variables.yml diff --git a/tests/functional/lvm-batch/Vagrantfile b/tests/functional/lvm-batch/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/lvm-batch/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-batch-container/ceph-override.json b/tests/functional/lvm-batch/ceph-override.json similarity index 100% rename from tests/functional/centos/7/lvm-batch-container/ceph-override.json rename to tests/functional/lvm-batch/ceph-override.json diff --git a/tests/functional/lvm-batch/container/Vagrantfile b/tests/functional/lvm-batch/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/lvm-batch/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-batch/ceph-override.json b/tests/functional/lvm-batch/container/ceph-override.json similarity index 100% rename from tests/functional/centos/7/lvm-batch/ceph-override.json rename to tests/functional/lvm-batch/container/ceph-override.json diff --git a/tests/functional/centos/7/lvm-batch-container/group_vars/all b/tests/functional/lvm-batch/container/group_vars/all similarity index 100% rename from tests/functional/centos/7/lvm-batch-container/group_vars/all rename to tests/functional/lvm-batch/container/group_vars/all diff --git a/tests/functional/centos/7/lvm-batch-container/hosts b/tests/functional/lvm-batch/container/hosts similarity index 100% rename from tests/functional/centos/7/lvm-batch-container/hosts rename to tests/functional/lvm-batch/container/hosts diff --git a/tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml b/tests/functional/lvm-batch/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/lvm-batch-container/vagrant_variables.yml rename to tests/functional/lvm-batch/container/vagrant_variables.yml diff --git a/tests/functional/centos/7/lvm-batch/group_vars/all b/tests/functional/lvm-batch/group_vars/all similarity index 100% rename from tests/functional/centos/7/lvm-batch/group_vars/all rename to tests/functional/lvm-batch/group_vars/all diff --git a/tests/functional/centos/7/lvm-batch/hosts b/tests/functional/lvm-batch/hosts similarity index 100% rename from tests/functional/centos/7/lvm-batch/hosts rename to tests/functional/lvm-batch/hosts diff --git a/tests/functional/centos/7/lvm-batch/vagrant_variables.yml b/tests/functional/lvm-batch/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/lvm-batch/vagrant_variables.yml rename to tests/functional/lvm-batch/vagrant_variables.yml diff --git a/tests/functional/lvm-osds/Vagrantfile b/tests/functional/lvm-osds/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/lvm-osds/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/lvm-osds/ceph-override.json b/tests/functional/lvm-osds/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/lvm-osds/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/Vagrantfile b/tests/functional/lvm-osds/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/lvm-osds/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/ceph-override.json b/tests/functional/lvm-osds/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/lvm-osds/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/lvm-osds-container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all similarity index 100% rename from tests/functional/centos/7/lvm-osds-container/group_vars/all rename to tests/functional/lvm-osds/container/group_vars/all diff --git a/tests/functional/centos/7/lvm-osds-container/hosts b/tests/functional/lvm-osds/container/hosts similarity index 100% rename from tests/functional/centos/7/lvm-osds-container/hosts rename to tests/functional/lvm-osds/container/hosts diff --git a/tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml b/tests/functional/lvm-osds/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/lvm-osds-container/vagrant_variables.yml rename to tests/functional/lvm-osds/container/vagrant_variables.yml diff --git a/tests/functional/centos/7/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all similarity index 100% rename from tests/functional/centos/7/lvm-osds/group_vars/all rename to tests/functional/lvm-osds/group_vars/all diff --git a/tests/functional/centos/7/lvm-osds/hosts b/tests/functional/lvm-osds/hosts similarity index 100% rename from tests/functional/centos/7/lvm-osds/hosts rename to tests/functional/lvm-osds/hosts diff --git a/tests/functional/centos/7/lvm-osds/vagrant_variables.yml b/tests/functional/lvm-osds/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/lvm-osds/vagrant_variables.yml rename to tests/functional/lvm-osds/vagrant_variables.yml diff --git a/tests/functional/ooo-collocation/Vagrantfile b/tests/functional/ooo-collocation/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/ooo-collocation/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/ooo-collocation/ceph-override.json b/tests/functional/ooo-collocation/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/ooo-collocation/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts similarity index 100% rename from tests/functional/centos/7/ooo-collocation/hosts rename to tests/functional/ooo-collocation/hosts diff --git a/tests/functional/centos/7/ooo-collocation/vagrant_variables.yml b/tests/functional/ooo-collocation/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/ooo-collocation/vagrant_variables.yml rename to tests/functional/ooo-collocation/vagrant_variables.yml diff --git a/tests/functional/rgw-multisite/Vagrantfile b/tests/functional/rgw-multisite/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/rgw-multisite/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/rgw-multisite/ceph-override.json b/tests/functional/rgw-multisite/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/rgw-multisite/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/rgw-multisite/container/Vagrantfile b/tests/functional/rgw-multisite/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/rgw-multisite/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/rgw-multisite/container/ceph-override.json b/tests/functional/rgw-multisite/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/rgw-multisite/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite-container/group_vars/all b/tests/functional/rgw-multisite/container/group_vars/all similarity index 82% rename from tests/functional/centos/7/rgw-multisite-container/group_vars/all rename to tests/functional/rgw-multisite/container/group_vars/all index f5dedffd6..1949c2164 100644 --- a/tests/functional/centos/7/rgw-multisite-container/group_vars/all +++ b/tests/functional/rgw-multisite/container/group_vars/all @@ -14,8 +14,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/centos/7/rgw-multisite-container/group_vars/rgws b/tests/functional/rgw-multisite/container/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/rgw-multisite-container/group_vars/rgws rename to tests/functional/rgw-multisite/container/group_vars/rgws diff --git a/tests/functional/centos/7/rgw-multisite-container/hosts b/tests/functional/rgw-multisite/container/hosts similarity index 100% rename from tests/functional/centos/7/rgw-multisite-container/hosts rename to tests/functional/rgw-multisite/container/hosts diff --git a/tests/functional/centos/7/add-osds-container/Vagrantfile b/tests/functional/rgw-multisite/container/secondary/Vagrantfile similarity index 100% rename from tests/functional/centos/7/add-osds-container/Vagrantfile rename to tests/functional/rgw-multisite/container/secondary/Vagrantfile diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/all b/tests/functional/rgw-multisite/container/secondary/group_vars/all similarity index 76% rename from tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/all rename to tests/functional/rgw-multisite/container/secondary/group_vars/all index e8a2fa5d6..bb51d7930 100644 --- a/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/container/secondary/group_vars/all @@ -14,8 +14,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/rgws b/tests/functional/rgw-multisite/container/secondary/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/rgw-multisite-container/secondary/group_vars/rgws rename to tests/functional/rgw-multisite/container/secondary/group_vars/rgws diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/hosts b/tests/functional/rgw-multisite/container/secondary/hosts similarity index 100% rename from tests/functional/centos/7/rgw-multisite-container/secondary/hosts rename to tests/functional/rgw-multisite/container/secondary/hosts diff --git a/tests/functional/centos/7/rgw-multisite-container/secondary/vagrant_variables.yml b/tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/rgw-multisite-container/secondary/vagrant_variables.yml rename to tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml diff --git a/tests/functional/centos/7/rgw-multisite-container/vagrant_variables.yml b/tests/functional/rgw-multisite/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/rgw-multisite-container/vagrant_variables.yml rename to tests/functional/rgw-multisite/container/vagrant_variables.yml diff --git a/tests/functional/centos/7/rgw-multisite/group_vars/all b/tests/functional/rgw-multisite/group_vars/all similarity index 79% rename from tests/functional/centos/7/rgw-multisite/group_vars/all rename to tests/functional/rgw-multisite/group_vars/all index 607799897..3a9a13eb5 100644 --- a/tests/functional/centos/7/rgw-multisite/group_vars/all +++ b/tests/functional/rgw-multisite/group_vars/all @@ -12,8 +12,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/centos/7/rgw-multisite/group_vars/rgws b/tests/functional/rgw-multisite/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/rgw-multisite/group_vars/rgws rename to tests/functional/rgw-multisite/group_vars/rgws diff --git a/tests/functional/centos/7/rgw-multisite/hosts b/tests/functional/rgw-multisite/hosts similarity index 100% rename from tests/functional/centos/7/rgw-multisite/hosts rename to tests/functional/rgw-multisite/hosts diff --git a/tests/functional/rgw-multisite/secondary/Vagrantfile b/tests/functional/rgw-multisite/secondary/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/rgw-multisite/secondary/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/rgw-multisite/secondary/group_vars/all b/tests/functional/rgw-multisite/secondary/group_vars/all similarity index 74% rename from tests/functional/centos/7/rgw-multisite/secondary/group_vars/all rename to tests/functional/rgw-multisite/secondary/group_vars/all index 08fca3c9d..2b605f43e 100644 --- a/tests/functional/centos/7/rgw-multisite/secondary/group_vars/all +++ b/tests/functional/rgw-multisite/secondary/group_vars/all @@ -12,8 +12,12 @@ osd_scenario: lvm copy_admin_key: true # test-volume is created by tests/functional/lvm_setup.yml from /dev/sdb lvm_volumes: - - data: /dev/sda - - data: /dev/sdb + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals os_tuning_params: - { name: fs.file-max, value: 26234859 } ceph_conf_overrides: diff --git a/tests/functional/centos/7/rgw-multisite/secondary/group_vars/rgws b/tests/functional/rgw-multisite/secondary/group_vars/rgws similarity index 100% rename from tests/functional/centos/7/rgw-multisite/secondary/group_vars/rgws rename to tests/functional/rgw-multisite/secondary/group_vars/rgws diff --git a/tests/functional/centos/7/rgw-multisite/secondary/hosts b/tests/functional/rgw-multisite/secondary/hosts similarity index 100% rename from tests/functional/centos/7/rgw-multisite/secondary/hosts rename to tests/functional/rgw-multisite/secondary/hosts diff --git a/tests/functional/centos/7/rgw-multisite/secondary/vagrant_variables.yml b/tests/functional/rgw-multisite/secondary/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/rgw-multisite/secondary/vagrant_variables.yml rename to tests/functional/rgw-multisite/secondary/vagrant_variables.yml diff --git a/tests/functional/centos/7/rgw-multisite/vagrant_variables.yml b/tests/functional/rgw-multisite/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/rgw-multisite/vagrant_variables.yml rename to tests/functional/rgw-multisite/vagrant_variables.yml diff --git a/tests/functional/shrink_mon/Vagrantfile b/tests/functional/shrink_mon/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/shrink_mon/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/centos/7/shrink_osd/ceph-override.json b/tests/functional/shrink_mon/ceph-override.json similarity index 100% rename from tests/functional/centos/7/shrink_osd/ceph-override.json rename to tests/functional/shrink_mon/ceph-override.json diff --git a/tests/functional/shrink_mon/container/Vagrantfile b/tests/functional/shrink_mon/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/shrink_mon/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/ceph-override.json b/tests/functional/shrink_mon/container/ceph-override.json new file mode 100644 index 000000000..cce7e62e8 --- /dev/null +++ b/tests/functional/shrink_mon/container/ceph-override.json @@ -0,0 +1,21 @@ +{ + "ceph_conf_overrides": { + "global": { + "osd_pool_default_pg_num": 12, + "osd_pool_default_size": 1 + } + }, + "cephfs_pools": [ + { + "name": "cephfs_metadata", + "pgs": 8, + "size": 1 + }, + { + "name": "cephfs_data", + "pgs": 8, + "size": 1 + } + ], + "ceph_mon_docker_memory_limit": "2g" +} diff --git a/tests/functional/shrink_mon/container/group_vars/all b/tests/functional/shrink_mon/container/group_vars/all new file mode 100644 index 000000000..f0bdd3aed --- /dev/null +++ b/tests/functional/shrink_mon/container/group_vars/all @@ -0,0 +1,15 @@ +--- +# this is only here to let the CI tests know +# that this scenario is using docker +docker: True + +containerized_deployment: True +monitor_interface: eth1 +ceph_mon_docker_subnet: "{{ public_network }}" +ceph_docker_on_openstack: False +public_network: "192.168.17.0/24" +cluster_network: "192.168.18.0/24" +ceph_conf_overrides: + global: + osd_pool_default_size: 1 +openstack_config: False diff --git a/tests/functional/shrink_mon/container/group_vars/mons b/tests/functional/shrink_mon/container/group_vars/mons new file mode 100644 index 000000000..0e679799d --- /dev/null +++ b/tests/functional/shrink_mon/container/group_vars/mons @@ -0,0 +1,3 @@ +--- +create_crush_tree: False +crush_rule_config: False \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/group_vars/osds b/tests/functional/shrink_mon/container/group_vars/osds new file mode 100644 index 000000000..672a0f956 --- /dev/null +++ b/tests/functional/shrink_mon/container/group_vars/osds @@ -0,0 +1,11 @@ +--- +ceph_osd_docker_run_script_path: /var/tmp +osd_objectstore: "bluestore" +osd_scenario: lvm +lvm_volumes: + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/hosts b/tests/functional/shrink_mon/container/hosts new file mode 100644 index 000000000..5d91b7dbd --- /dev/null +++ b/tests/functional/shrink_mon/container/hosts @@ -0,0 +1,7 @@ +[mons] +mon0 +mon1 +mon2 + +[osds] +osd0 \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/vagrant_variables.yml b/tests/functional/shrink_mon/container/vagrant_variables.yml new file mode 100644 index 000000000..d52a3a974 --- /dev/null +++ b/tests/functional/shrink_mon/container/vagrant_variables.yml @@ -0,0 +1,60 @@ +--- + +# DEPLOY CONTAINERIZED DAEMONS +docker: True + +# DEFINE THE NUMBER OF VMS TO RUN +mon_vms: 3 +osd_vms: 1 +mds_vms: 0 +rgw_vms: 0 +nfs_vms: 0 +rbd_mirror_vms: 0 +client_vms: 0 +iscsi_gw_vms: 0 +mgr_vms: 0 + +# SUBNETS TO USE FOR THE VMS +public_subnet: 192.168.17 +cluster_subnet: 192.168.18 + +# MEMORY +# set 1024 for CentOS +memory: 1024 + +# Disks +# For libvirt use disks: "[ '/dev/vdb', '/dev/vdc' ]" +# For CentOS7 use disks: "[ '/dev/sda', '/dev/sdb' ]" +disks: "[ '/dev/sda', '/dev/sdb' ]" + +# 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 +# now): +# +# * ceph/ubuntu-xenial +# +# Ubuntu: ceph/ubuntu-xenial bento/ubuntu-16.04 or ubuntu/trusty64 or ubuntu/wily64 +# CentOS: bento/centos-7.1 or puppetlabs/centos-7.0-64-puppet +# libvirt CentOS: centos/7 +# parallels Ubuntu: parallels/ubuntu-14.04 +# Debian: deb/jessie-amd64 - be careful the storage controller is named 'SATA Controller' +# For more boxes have a look at: +# - 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 +#vagrant_sync_dir: /home/vagrant/sync +vagrant_sync_dir: /vagrant +# Disables synced folder creation. Not needed for testing, will skip mounting +# the vagrant directory on the remote box regardless of the provider. +vagrant_disable_synced_folder: true +# VAGRANT URL +# This is a URL to download an image from an alternate location. vagrant_box +# above should be set to the filename of the image. +# 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 diff --git a/tests/functional/shrink_mon/group_vars/all b/tests/functional/shrink_mon/group_vars/all new file mode 100644 index 000000000..941aad208 --- /dev/null +++ b/tests/functional/shrink_mon/group_vars/all @@ -0,0 +1,8 @@ +--- +ceph_origin: repository +ceph_repository: community +public_network: "192.168.1.0/24" +cluster_network: "192.168.2.0/24" +ceph_conf_overrides: + global: + osd_pool_default_size: 1 \ No newline at end of file diff --git a/tests/functional/shrink_mon/group_vars/mons b/tests/functional/shrink_mon/group_vars/mons new file mode 100644 index 000000000..0e679799d --- /dev/null +++ b/tests/functional/shrink_mon/group_vars/mons @@ -0,0 +1,3 @@ +--- +create_crush_tree: False +crush_rule_config: False \ No newline at end of file diff --git a/tests/functional/shrink_mon/group_vars/osds b/tests/functional/shrink_mon/group_vars/osds new file mode 100644 index 000000000..e27c47422 --- /dev/null +++ b/tests/functional/shrink_mon/group_vars/osds @@ -0,0 +1,12 @@ +--- +os_tuning_params: + - { name: fs.file-max, value: 26234859 } +osd_scenario: lvm +osd_objectstore: "bluestore" +lvm_volumes: + - data: data-lv1 + data_vg: test_group + - data: data-lv2 + data_vg: test_group + db: journal1 + db_vg: journals \ No newline at end of file diff --git a/tests/functional/shrink_mon/hosts b/tests/functional/shrink_mon/hosts new file mode 100644 index 000000000..b2631e083 --- /dev/null +++ b/tests/functional/shrink_mon/hosts @@ -0,0 +1,7 @@ +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[osds] +osd0 \ No newline at end of file diff --git a/tests/functional/shrink_mon/hosts-switch-to-containers b/tests/functional/shrink_mon/hosts-switch-to-containers new file mode 100644 index 000000000..d72da6b7b --- /dev/null +++ b/tests/functional/shrink_mon/hosts-switch-to-containers @@ -0,0 +1,19 @@ +[all:vars] +docker=True + +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[osds] +osd0 + +[mdss] +mds0 + +[rgws] +rgw0 + +[clients] +client0 diff --git a/tests/functional/shrink_mon/hosts-ubuntu b/tests/functional/shrink_mon/hosts-ubuntu new file mode 100644 index 000000000..eebaf4e8e --- /dev/null +++ b/tests/functional/shrink_mon/hosts-ubuntu @@ -0,0 +1,35 @@ +[mons] +mon0 monitor_address=192.168.1.10 +mon1 monitor_interface=eth1 +mon2 monitor_address=192.168.1.12 + +[osds] +osd0 +osd1 + +[mdss] +mds0 + +[rgws] +rgw0 + +[clients] +client0 +client1 + +#[nfss] +#nfs0 + +[rbdmirrors] +rbd-mirror0 + +[iscsigws] +iscsi-gw0 ceph_repository="dev" + +[all:vars] +debian_ceph_packages=['ceph', 'ceph-common', 'ceph-fuse'] +nfs_ganesha_stable=True +nfs_ganesha_stable_branch="V2.5-stable" +nfs_ganesha_stable_deb_repo="{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" +nfs_ganesha_dev=False +nfs_ganesha_flavor="ceph_master" \ No newline at end of file diff --git a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml b/tests/functional/shrink_mon/vagrant_variables.yml similarity index 92% rename from tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml rename to tests/functional/shrink_mon/vagrant_variables.yml index d7d56f574..826f25c0b 100644 --- a/tests/functional/ubuntu/16.04/cluster/vagrant_variables.yml +++ b/tests/functional/shrink_mon/vagrant_variables.yml @@ -6,28 +6,25 @@ docker: false # DEFINE THE NUMBER OF VMS TO RUN mon_vms: 3 osd_vms: 1 -mds_vms: 1 -rgw_vms: 1 +mds_vms: 0 +rgw_vms: 0 nfs_vms: 0 rbd_mirror_vms: 0 -client_vms: 1 +client_vms: 0 iscsi_gw_vms: 0 -mgr_vms: 1 - -# Deploy RESTAPI on each of the Monitors -restapi: true +mgr_vms: 0 # INSTALL SOURCE OF CEPH # valid values are 'stable' and 'dev' ceph_install_source: stable # SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.5 -cluster_subnet: 192.168.6 +public_subnet: 192.168.1 +cluster_subnet: 192.168.2 # MEMORY # set 1024 for CentOS -memory: 512 +memory: 1024 # Ethernet interface name # use eth1 for libvirt and ubuntu precise, enp0s8 for CentOS and ubuntu xenial @@ -53,7 +50,7 @@ disks: "[ '/dev/sdb', '/dev/sdc' ]" # For more boxes have a look at: # - https://atlas.hashicorp.com/boxes/search?utf8=✓&sort=&provider=virtualbox&q= # - https://download.gluster.org/pub/gluster/purpleidea/vagrant/ -vagrant_box: ceph/ubuntu-xenial +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 @@ -71,3 +68,6 @@ vagrant_disable_synced_folder: true os_tuning_params: - { name: fs.file-max, value: 26234859 } + +# VM prefix name, need to match the hostname +# label_prefix: ceph diff --git a/tests/functional/shrink_osd/Vagrantfile b/tests/functional/shrink_osd/Vagrantfile new file mode 120000 index 000000000..706a5bb47 --- /dev/null +++ b/tests/functional/shrink_osd/Vagrantfile @@ -0,0 +1 @@ +../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/shrink_osd/ceph-override.json b/tests/functional/shrink_osd/ceph-override.json new file mode 100644 index 000000000..1a9600a14 --- /dev/null +++ b/tests/functional/shrink_osd/ceph-override.json @@ -0,0 +1,9 @@ +{ + "ceph_conf_overrides": { + "global": { + "osd_pool_default_pg_num": 12, + "osd_pool_default_size": 1 + } + }, + "ceph_mon_docker_memory_limit": "2g" +} diff --git a/tests/functional/shrink_osd/container/Vagrantfile b/tests/functional/shrink_osd/container/Vagrantfile new file mode 120000 index 000000000..16076e424 --- /dev/null +++ b/tests/functional/shrink_osd/container/Vagrantfile @@ -0,0 +1 @@ +../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/shrink_osd/container/ceph-override.json b/tests/functional/shrink_osd/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/shrink_osd/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/centos/7/shrink_osd_container/group_vars/all b/tests/functional/shrink_osd/container/group_vars/all similarity index 100% rename from tests/functional/centos/7/shrink_osd_container/group_vars/all rename to tests/functional/shrink_osd/container/group_vars/all diff --git a/tests/functional/centos/7/shrink_osd_container/group_vars/osds b/tests/functional/shrink_osd/container/group_vars/osds similarity index 100% rename from tests/functional/centos/7/shrink_osd_container/group_vars/osds rename to tests/functional/shrink_osd/container/group_vars/osds diff --git a/tests/functional/centos/7/shrink_osd_container/hosts b/tests/functional/shrink_osd/container/hosts similarity index 100% rename from tests/functional/centos/7/shrink_osd_container/hosts rename to tests/functional/shrink_osd/container/hosts diff --git a/tests/functional/centos/7/shrink_osd_container/vagrant_variables.yml b/tests/functional/shrink_osd/container/vagrant_variables.yml similarity index 100% rename from tests/functional/centos/7/shrink_osd_container/vagrant_variables.yml rename to tests/functional/shrink_osd/container/vagrant_variables.yml diff --git a/tests/functional/centos/7/shrink_osd/group_vars/all b/tests/functional/shrink_osd/group_vars/all similarity index 100% rename from tests/functional/centos/7/shrink_osd/group_vars/all rename to tests/functional/shrink_osd/group_vars/all diff --git a/tests/functional/centos/7/shrink_osd/group_vars/osds b/tests/functional/shrink_osd/group_vars/osds similarity index 100% rename from tests/functional/centos/7/shrink_osd/group_vars/osds rename to tests/functional/shrink_osd/group_vars/osds diff --git a/tests/functional/shrink_osd/hosts b/tests/functional/shrink_osd/hosts new file mode 100644 index 000000000..3ef2fc311 --- /dev/null +++ b/tests/functional/shrink_osd/hosts @@ -0,0 +1,10 @@ +[mons] +mon0 monitor_address=192.168.71.10 + +[mgrs] +mon0 + +[osds] +osd0 +osd1 +osd2 diff --git a/tests/functional/centos/7/shrink_osd/vagrant_variables.yml b/tests/functional/shrink_osd/vagrant_variables.yml similarity index 99% rename from tests/functional/centos/7/shrink_osd/vagrant_variables.yml rename to tests/functional/shrink_osd/vagrant_variables.yml index 768b7b7eb..1cbe552ca 100644 --- a/tests/functional/centos/7/shrink_osd/vagrant_variables.yml +++ b/tests/functional/shrink_osd/vagrant_variables.yml @@ -73,4 +73,4 @@ os_tuning_params: - { name: fs.file-max, value: 26234859 } # VM prefix name, need to match the hostname -label_prefix: ceph +# label_prefix: ceph diff --git a/tests/functional/ubuntu/16.04/cluster/Vagrantfile b/tests/functional/ubuntu/16.04/cluster/Vagrantfile deleted file mode 120000 index dfd7436c9..000000000 --- a/tests/functional/ubuntu/16.04/cluster/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/ubuntu/16.04/cluster/ceph-override.json b/tests/functional/ubuntu/16.04/cluster/ceph-override.json deleted file mode 100644 index 9a3af9436..000000000 --- a/tests/functional/ubuntu/16.04/cluster/ceph-override.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12 - } - } -} diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/all b/tests/functional/ubuntu/16.04/cluster/group_vars/all deleted file mode 100644 index 4550c1d3e..000000000 --- a/tests/functional/ubuntu/16.04/cluster/group_vars/all +++ /dev/null @@ -1,30 +0,0 @@ ---- -ceph_origin: repository -ceph_repository: community -cluster: test -public_network: "192.168.5.0/24" -cluster_network: "192.168.6.0/24" -monitor_interface: eth1 -radosgw_interface: eth1 -journal_size: 100 -devices: - - '/dev/disk/by-id/ata-QEMU_HARDDISK_QM00001' - - '/dev/sdb' -dedicated_devices: - - '/dev/sdc' - - '/dev/sdc' -osd_scenario: non-collocated -os_tuning_params: - - { name: fs.file-max, value: 26234859 } -ceph_conf_overrides: - global: - osd_pool_default_size: 1 -debian_ceph_packages: - - ceph - - ceph-common - - ceph-fuse -nfs_ganesha_stable: true -nfs_ganesha_stable_branch: V2.5-stable -nfs_ganesha_stable_deb_repo: "{{ ceph_mirror }}/nfs-ganesha/deb-{{ nfs_ganesha_stable_branch }}/{{ ceph_stable_release }}" -nfs_ganesha_dev: false -nfs_ganesha_flavor: "ceph_master" \ No newline at end of file diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/nfss b/tests/functional/ubuntu/16.04/cluster/group_vars/nfss deleted file mode 100644 index 2d2f83bb6..000000000 --- a/tests/functional/ubuntu/16.04/cluster/group_vars/nfss +++ /dev/null @@ -1,7 +0,0 @@ -copy_admin_key: true -nfs_file_gw: false -nfs_obj_gw: true -ganesha_conf_overrides: | - CACHEINODE { - Entries_HWMark = 100000; - } diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/osds b/tests/functional/ubuntu/16.04/cluster/group_vars/osds deleted file mode 100644 index 77f10f0aa..000000000 --- a/tests/functional/ubuntu/16.04/cluster/group_vars/osds +++ /dev/null @@ -1,3 +0,0 @@ ---- -os_tuning_params: - - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/cluster/group_vars/rgws b/tests/functional/ubuntu/16.04/cluster/group_vars/rgws deleted file mode 100644 index a88254314..000000000 --- a/tests/functional/ubuntu/16.04/cluster/group_vars/rgws +++ /dev/null @@ -1,8 +0,0 @@ -copy_admin_key: true -rgw_create_pools: - foo: - pg_num: 17 - bar: - pg_num: 19 -rgw_override_bucket_index_max_shards: 16 -rgw_bucket_default_quota_max_objects: 1638400 diff --git a/tests/functional/ubuntu/16.04/cluster/hosts b/tests/functional/ubuntu/16.04/cluster/hosts deleted file mode 100644 index 5307fbc5a..000000000 --- a/tests/functional/ubuntu/16.04/cluster/hosts +++ /dev/null @@ -1,22 +0,0 @@ -[mons] -mon0 monitor_address=192.168.5.10 -mon1 monitor_address=192.168.5.11 -mon2 monitor_address=192.168.5.12 - -[mgrs] -mgr0 - -[osds] -osd0 - -[mdss] -mds0 - -[rgws] -rgw0 - -[clients] -client0 - -#[nfss] -#nfs0 diff --git a/tox.ini b/tox.ini index 752d026ec..51a4092b8 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,7 @@ [tox] -envlist = {dev,luminous,mimic,rhcs}-{xenial_cluster,centos7_cluster,cluster,docker_cluster,update_cluster,update_docker_cluster,switch_to_containers,ooo_collocation,bluestore_lvm_osds,bluestore_lvm_osds_container,lvm_osds,shrink_mon,shrink_osd,shrink_mon_container,shrink_osd_container,docker_cluster_collocation,lvm_batch,lvm_osds_container,lvm_batch_container,infra_lv_create,add_osds,add_osds_container,rgw_multisite,rgw_multisite_container,purge_cluster_container,purge_cluster_non_container} +envlist = {luminous,mimic,rhcs}-{centos,ubuntu}-{container,non_container}-{all_daemons,collocation,update,bluestore_lvm_osds,lvm_osds,shrink_mon,shrink_osd,lvm_batch,add_osds,rgw_multisite,purge} + {luminous,mimic,rhcs}-{centos,ubuntu}-non_container-switch_to_containers + {luminous,mimic,rhcs}-{centos,ubuntu}-container-{cluster,ooo_collocation,infra_lv_create} infra_lv_create skipsdist = True @@ -15,7 +17,7 @@ whitelist_externals = passenv=* setenv= ANSIBLE_SSH_ARGS = -F {changedir}/vagrant_ssh_config - ANSIBLE_CONFIG = -F {toxinidir}/ansible.cfg + ANSIBLE_CONFIG = {toxinidir}/ansible.cfg ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback ANSIBLE_CALLBACK_WHITELIST = profile_tasks @@ -44,59 +46,55 @@ commands= [purge] commands= cp {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " # re-setup lvm - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml # set up the cluster again - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " # test that the cluster can be redeployed in a healthy state - testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests + testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests [purge-lvm] commands= cp {toxinidir}/infrastructure-playbooks/{env:PURGE_PLAYBOOK:purge-cluster.yml} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PURGE_PLAYBOOK:purge-cluster.yml} --extra-vars "\ ireallymeanit=yes \ remove_packages=yes \ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml # set up the cluster again - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " # test that the cluster can be redeployed in a healthy state - testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests + testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests # extra commands for performing a rolling update # currently this hardcodes the release to kraken @@ -104,30 +102,30 @@ commands= [update] commands= cp {toxinidir}/infrastructure-playbooks/rolling_update.yml {toxinidir}/rolling_update.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/rolling_update.yml --extra-vars "\ + ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "change_dir={changedir} ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/rolling_update.yml --extra-vars "\ ireallymeanit=yes \ - ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:kraken} \ + ceph_stable_release={env:UPDATE_CEPH_STABLE_RELEASE:luminous} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:UPDATE_CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-master} \ - ceph_dev_branch={env:UPDATE_CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:UPDATE_CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:UPDATE_CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " - bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:luminous} testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests" + bash -c "CEPH_STABLE_RELEASE={env:UPDATE_CEPH_STABLE_RELEASE:luminous} testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests" [shrink-mon] commands= cp {toxinidir}/infrastructure-playbooks/shrink-mon.yml {toxinidir}/shrink-mon.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/shrink-mon.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/shrink-mon.yml --extra-vars "\ ireallymeanit=yes \ - mon_to_kill={env:MON_TO_KILL:ceph-mon2} \ + mon_to_kill={env:MON_TO_KILL:mon2} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " [shrink-osd] commands= cp {toxinidir}/infrastructure-playbooks/shrink-osd.yml {toxinidir}/shrink-osd.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/shrink-osd.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/shrink-osd.yml --extra-vars "\ ireallymeanit=yes \ osd_to_kill=0 \ " @@ -135,14 +133,12 @@ commands= [switch-to-containers] commands= cp {toxinidir}/infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml {toxinidir}/switch-from-non-containerized-to-containerized-ceph-daemons.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/switch-from-non-containerized-to-containerized-ceph-daemons.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-switch-to-containers {toxinidir}/tests/functional/tests @@ -150,16 +146,15 @@ commands= [add-osds] commands= ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/setup.yml + ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/tests/functional/lvm_setup.yml cp {toxinidir}/infrastructure-playbooks/add-osd.yml {toxinidir}/add-osd.yml ansible-playbook -vv -i {changedir}/hosts-2 --limit osd1 {toxinidir}/add-osd.yml --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " testinfra -n 4 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts-2 {toxinidir}/tests/functional/tests @@ -173,12 +168,10 @@ commands= ansible-playbook --ssh-extra-args='-F {changedir}/secondary/vagrant_ssh_config' -vv -i {changedir}/secondary/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ ireallymeanit=yes \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/secondary/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest} \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ " ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rgw_multisite.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}" ansible-playbook -vv --ssh-extra-args='-F {changedir}/secondary/vagrant_ssh_config' -i {changedir}/secondary/hosts {toxinidir}/tests/functional/rgw_multisite.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest}" @@ -201,163 +194,106 @@ setenv= ANSIBLE_ACTION_PLUGINS = {toxinidir}/plugins/actions ANSIBLE_CALLBACK_PLUGINS = {toxinidir}/plugins/callback ANSIBLE_CALLBACK_WHITELIST = profile_tasks - # only available for ansible >= 2.2 ANSIBLE_STDOUT_CALLBACK = debug - ansible2.2: DELEGATE_FACTS_HOST = False - docker_cluster: PLAYBOOK = site-docker.yml.sample - docker_cluster_collocation: PLAYBOOK = site-docker.yml.sample - ooo_collocation: PLAYBOOK = site-docker.yml.sample - update_docker_cluster: PLAYBOOK = site-docker.yml.sample - purge_cluster_container: PLAYBOOK = site-docker.yml.sample - purge_cluster_container: PURGE_PLAYBOOK = purge-docker-cluster.yml - add_osds: PLAYBOOK = site.yml.sample - add_osds_container: PLAYBOOK = site-docker.yml.sample - rgw_multisite: PLAYBOOK = site.yml.sample - rgw_multisite_container: PLAYBOOK = site-docker.yml.sample - shrink_mon_container: PLAYBOOK = site-docker.yml.sample - shrink_mon_container: MON_TO_KILL = mon2 - shrink_osd_container: PLAYBOOK = site-docker.yml.sample - shrink_osd_container: COPY_ADMIN_KEY = True - shrink_osd: COPY_ADMIN_KEY = True + ANSIBLE_KEEP_REMOTE_FILES = 1 + # only available for ansible >= 2.5 + centos: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 + fedora: CEPH_ANSIBLE_VAGRANT_BOX = fedora/29-atomic-host + # Set the vagrant box image to use + centos-non_container: CEPH_ANSIBLE_VAGRANT_BOX = centos/7 + centos-container: CEPH_ANSIBLE_VAGRANT_BOX = centos/atomic-host + ubuntu: CEPH_ANSIBLE_VAGRANT_BOX = ceph/ubuntu-xenial + # Set the ansible inventory host file to be used according to which distrib we are running on + ubuntu: _INVENTORY = hosts-ubuntu + INVENTORY = {env:_INVENTORY:hosts} + container: CONTAINER_DIR = /container + container: PLAYBOOK = site-docker.yml.sample + non_container: PLAYBOOK = site.yml.sample + container-purge_cluster: PURGE_PLAYBOOK = purge-docker-cluster.yml + shrink_mon: MON_TO_KILL = mon2 + shrink_osd: COPY_ADMIN_KEY = True rhcs: CEPH_STABLE_RELEASE = luminous - luminous: CEPH_STABLE_RELEASE = luminous - luminous: CEPH_DOCKER_IMAGE_TAG = latest-luminous - luminous: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis-luminous - luminous: UPDATE_CEPH_STABLE_RELEASE = luminous - luminous: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest - mimic: CEPH_STABLE_RELEASE = mimic - mimic: CEPH_DOCKER_IMAGE_TAG = latest-mimic - mimic: CEPH_DOCKER_IMAGE_TAG_BIS = latest-bis - mimic: UPDATE_CEPH_STABLE_RELEASE = mimic - mimic: UPDATE_CEPH_DOCKER_IMAGE_TAG = latest lvm_osds: CEPH_STABLE_RELEASE = luminous - lvm_osds: PLAYBOOK = site.yml.sample - lvm_osds_container: CEPH_STABLE_RELEASE = luminous - lvm_osds_container: PLAYBOOK = site-docker.yml.sample - bluestore_lvm_osds: CEPH_STABLE_RELEASE = luminous - bluestore_lvm_osds_container: CEPH_STABLE_RELEASE = luminous - bluestore_lvm_osds_container: PLAYBOOK = site-docker.yml.sample - lvm_batch_container: PLAYBOOK = site-docker.yml.sample - lvm_batch_container: CEPH_STABLE_RELEASE = luminous - update_cluster: ROLLING_UPDATE = True - update_docker_cluster: ROLLING_UPDATE = True - add_osds: CEPH_STABLE_RELEASE = luminous - add_osds_container: CEPH_STABLE_RELEASE = luminous - rgw_multisite: CEPH_STABLE_RELEASE = luminous - rgw_multisite_container: CEPH_STABLE_RELEASE = luminous + rhcs: CEPH_STABLE_RELEASE = luminous + update: ROLLING_UPDATE = True + update: CEPH_STABLE_RELEASE = jewel + container-update: CEPH_DOCKER_IMAGE_TAG = latest-jewel + container-update: CEPH_DOCKER_IMAGE_TAG_BIS = latest-jewel-bis ooo_collocation: CEPH_DOCKER_IMAGE_TAG = v3.0.3-stable-3.0-luminous-centos-7-x86_64 + deps= -r{toxinidir}/tests/requirements.txt changedir= - # tests a 1 mon, 1 osd, 1 mds and 1 rgw xenial cluster using non-collocated OSD scenario - xenial_cluster: {toxinidir}/tests/functional/ubuntu/16.04/cluster - # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using non-collocated OSD scenario - centos7_cluster: {toxinidir}/tests/functional/centos/7/cluster - shrink_mon: {toxinidir}/tests/functional/centos/7/cluster - shrink_mon_container: {toxinidir}/tests/functional/centos/7/docker - shrink_osd: {toxinidir}/tests/functional/centos/7/shrink_osd - shrink_osd_container: {toxinidir}/tests/functional/centos/7/shrink_osd_container - # an alias for centos7_cluster, this makes the name better suited for rhcs testing - cluster: {toxinidir}/tests/functional/centos/7/cluster + all_daemons: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} + cluster: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} + shrink_mon: {toxinidir}/tests/functional/shrink_mon{env:CONTAINER_DIR:} + shrink_osd: {toxinidir}/tests/functional/shrink_osd{env:CONTAINER_DIR:} # tests a 1 mon, 1 osd, 1 mds and 1 rgw centos7 cluster using docker - docker_cluster: {toxinidir}/tests/functional/centos/7/docker - docker_cluster_collocation: {toxinidir}/tests/functional/centos/7/docker-collocation - update_docker_cluster: {toxinidir}/tests/functional/centos/7/docker - purge_cluster_non_container: {toxinidir}/tests/functional/centos/7/cluster - purge_cluster_container: {toxinidir}/tests/functional/centos/7/docker - update_cluster: {toxinidir}/tests/functional/centos/7/cluster - switch_to_containers: {toxinidir}/tests/functional/centos/7/cluster - lvm_osds: {toxinidir}/tests/functional/centos/7/lvm-osds - lvm_osds_container: {toxinidir}/tests/functional/centos/7/lvm-osds-container - lvm_batch: {toxinidir}/tests/functional/centos/7/lvm-batch - lvm_batch_container: {toxinidir}/tests/functional/centos/7/lvm-batch-container - bluestore_lvm_osds: {toxinidir}/tests/functional/centos/7/bs-lvm-osds - bluestore_lvm_osds_container: {toxinidir}/tests/functional/centos/7/bs-lvm-osds-container - ooo_collocation: {toxinidir}/tests/functional/centos/7/ooo-collocation - add_osds: {toxinidir}/tests/functional/centos/7/add-osds - add_osds_container: {toxinidir}/tests/functional/centos/7/add-osds-container - rgw_multisite: {toxinidir}/tests/functional/centos/7/rgw-multisite - rgw_multisite_container: {toxinidir}/tests/functional/centos/7/rgw-multisite-container + collocation: {toxinidir}/tests/functional/collocation{env:CONTAINER_DIR:} + update: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} + purge: {toxinidir}/tests/functional/all_daemons{env:CONTAINER_DIR:} + switch_to_containers: {toxinidir}/tests/functional/all_daemons + lvm_osds: {toxinidir}/tests/functional/lvm-osds{env:CONTAINER_DIR:} + lvm_batch: {toxinidir}/tests/functional/lvm-batch{env:CONTAINER_DIR:} + bluestore_lvm_osds: {toxinidir}/tests/functional/bs-lvm-osds{env:CONTAINER_DIR:} + ooo_collocation: {toxinidir}/tests/functional/ooo-collocation + add_osds: {toxinidir}/tests/functional/add-osds{env:CONTAINER_DIR:} + rgw_multisite: {toxinidir}/tests/functional/rgw-multisite{env:CONTAINER_DIR:} commands= rhcs: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "change_dir={changedir}" --tags "vagrant_setup" - dev: ansible-playbook -vv -i "localhost," -c local {toxinidir}/tests/functional/dev_setup.yml --extra-vars "change_dir={changedir} ceph_dev_branch={env:CEPH_DEV_BRANCH:master} ceph_dev_sha1={env:CEPH_DEV_SHA1:latest}" --tags "vagrant_setup" vagrant up --no-provision {posargs:--provider=virtualbox} bash {toxinidir}/tests/scripts/generate_ssh_config.sh {changedir} # configure lvm - cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - centos7_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - docker_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - docker_cluster_collocation: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - lvm_osds_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - bluestore_lvm_osds: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - bluestore_lvm_osds_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - shrink_osd: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - shrink_osd_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - update_docker_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - update_cluster: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - purge_cluster_non_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - purge_cluster_container: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml - switch_to_containers: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/lvm_setup.yml + !lvm_batch: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/lvm_setup.yml - rhcs: ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" + rhcs: ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/rhcs_setup.yml --extra-vars "ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} repo_url={env:REPO_URL:} rhel7_repo_url={env:RHEL7_REPO_URL:}" --skip-tags "vagrant_setup" - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/setup.yml + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/setup.yml - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-master} \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG:latest-luminous} \ copy_admin_key={env:COPY_ADMIN_KEY:False} \ " # wait 30sec for services to be ready sleep 30 # test cluster state using ceph-ansible tests - testinfra -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests + testinfra -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests # reboot all vms - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/tests/functional/reboot.yml + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/tests/functional/reboot.yml # wait 30sec for services to be ready sleep 30 # retest to ensure cluster came back up correctly after rebooting - testinfra -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/hosts {toxinidir}/tests/functional/tests + testinfra -n 8 --sudo -v --connection=ansible --ansible-inventory={changedir}/{env:INVENTORY} {toxinidir}/tests/functional/tests # handlers/idempotency test - ansible-playbook -vv -i {changedir}/hosts {toxinidir}/{env:PLAYBOOK:site.yml.sample} \ + ansible-playbook -vv -i {changedir}/{env:INVENTORY} {toxinidir}/{env:PLAYBOOK:site.yml.sample} \ --extra-vars "\ delegate_facts_host={env:DELEGATE_FACTS_HOST:True} \ fetch_directory={env:FETCH_DIRECTORY:{changedir}/fetch} \ - ceph_stable_release={env:CEPH_STABLE_RELEASE:mimic} \ + ceph_stable_release={env:CEPH_STABLE_RELEASE:luminous} \ ceph_docker_registry={env:CEPH_DOCKER_REGISTRY:docker.io} \ ceph_docker_image={env:CEPH_DOCKER_IMAGE:ceph/daemon} \ - ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-master} # not ideal but what can we do? \ - ceph_dev_branch={env:CEPH_DEV_BRANCH:master} \ - ceph_dev_sha1={env:CEPH_DEV_SHA1:latest} \ + ceph_docker_image_tag={env:CEPH_DOCKER_IMAGE_TAG_BIS:latest-bis-luminous} # not ideal but what can we do? \ copy_admin_key={env:COPY_ADMIN_KEY:False} " \ --extra-vars @ceph-override.json - purge_cluster_non_container: {[purge]commands} - purge_cluster_container: {[purge]commands} + purge: {[purge]commands} switch_to_containers: {[switch-to-containers]commands} - update_cluster: {[update]commands} - update_docker_cluster: {[update]commands} + update: {[update]commands} shrink_mon: {[shrink-mon]commands} - shrink_mon_container: {[shrink-mon]commands} shrink_osd: {[shrink-osd]commands} - shrink_osd_container: {[shrink-osd]commands} add_osds: {[add-osds]commands} - add_osds_container: {[add-osds]commands} rgw_multisite: {[rgw-multisite]commands} - rgw_multisite_container: {[rgw-multisite]commands} vagrant destroy --force