diff --git a/tests/functional/ooo-collocation/Vagrantfile b/tests/functional/ooo-collocation/Vagrantfile deleted file mode 120000 index 706a5bb47..000000000 --- a/tests/functional/ooo-collocation/Vagrantfile +++ /dev/null @@ -1 +0,0 @@ -../../../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 deleted file mode 120000 index fe2ff40d6..000000000 --- a/tests/functional/ooo-collocation/ceph-override.json +++ /dev/null @@ -1 +0,0 @@ -../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts deleted file mode 100644 index 812bd8c26..000000000 --- a/tests/functional/ooo-collocation/hosts +++ /dev/null @@ -1,86 +0,0 @@ -all: - vars: - admin_secret: AQBSV4xaAAAAABAA3VUTiOZTHecau2SnAEVPYQ== - ceph_conf_overrides: - global: {osd_pool_default_pg_num: 8, osd_pool_default_pgp_num: 8, osd_pool_default_size: 1, - mon_allow_pool_size_one: true, - mon_warn_on_pool_no_redundancy: false, - rgw_keystone_accepted_roles: 'Member, admin', rgw_keystone_admin_domain: default, - rgw_keystone_admin_password: RtYPg7AUdsZCGv4Z4rF8FvnaR, rgw_keystone_admin_project: service, - rgw_keystone_admin_user: swift, rgw_keystone_api_version: 3, rgw_keystone_implicit_tenants: 'true', - rgw_keystone_url: 'http://192.168.95.10:5000', rgw_s3_auth_use_keystone: 'true', rgw_keystone_revocation_interval: 0} - cluster: mycluster - ceph_docker_image: ceph/daemon - ceph_docker_image_tag: latest-main - ceph_docker_registry: quay.io - cephfs_data_pool: - name: 'manila_data' - application: "cephfs" - cephfs_metadata_pool: - name: 'manila_metadata' - application: "cephfs" - cephfs_pools: - - "{{ cephfs_data_pool }}" - - "{{ cephfs_metadata_pool }}" - cluster_network: 192.168.96.0/24 - containerized_deployment: true - devices: [/dev/sda, /dev/sdb, /dev/sdc] - docker: true - fsid: 6e008d48-1661-11e8-8546-008c3214218a - generate_fsid: false - ip_version: ipv4 - ireallymeanit: 'yes' - keys: - - {key: AQAN0RdbAAAAABAA3CpSKRVDrENjkOSunEFZ0A==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow r', name: client.openstack, osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=backups, allow rwx pool=vms, allow rwx pool=images, allow rwx pool=metrics"} - - {key: AQAN0RdbAAAAABAAtV5Dq28z4H6XxwhaNEaFZg==, mds_cap: 'allow *', mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow r, allow command "auth del", allow command "auth caps", allow command "auth get", allow command "auth get-or-create"', name: client.manila, osd_cap: 'allow rw'} - - {key: AQAN0RdbAAAAABAAH5D3WgMN9Rxw3M8jkpMIfg==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow rw', name: client.radosgw, osd_cap: 'allow rwx'} - monitor_address_block: 192.168.95.0/24 - monitor_secret: AQBSV4xaAAAAABAALqm4vRHcITs4/041TwluMg== - ntp_service_enabled: false - openstack_config: true - openstack_keys: - - {key: AQAN0RdbAAAAABAA3CpSKRVDrENjkOSunEFZ0A==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow r', name: client.openstack, osd_cap: "allow class-read object_prefix rbd_children, allow rwx pool=volumes, allow rwx pool=backups, allow rwx pool=vms, allow rwx pool=images, allow rwx pool=metrics"} - - {key: AQAN0RdbAAAAABAAtV5Dq28z4H6XxwhaNEaFZg==, mds_cap: 'allow *', mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow r, allow command "auth del", allow command "auth caps", allow command "auth get", allow command "auth get-or-create"', name: client.manila, osd_cap: 'allow rw'} - - {key: AQAN0RdbAAAAABAAH5D3WgMN9Rxw3M8jkpMIfg==, mgr_cap: 'allow *', mode: '0600', mon_cap: 'allow rw', name: client.radosgw, osd_cap: 'allow rwx'} - openstack_pools: - - {name: images, pg_num: 8, rule_name: 'replicated_rule'} - - {name: metrics, pg_num: 8, rule_name: 'replicated_rule'} - - {name: backups, pg_num: 8, rule_name: 'replicated_rule'} - - {name: vms, pg_num: 8, rule_name: 'replicated_rule'} - - {name: volumes, pg_num: 8, rule_name: 'replicated_rule'} - pools: [] - public_network: 192.168.95.0/24 - radosgw_address_block: 192.168.95.0/24 - radosgw_civetweb_port: '8080' - radosgw_keystone_ssl: false - user_config: true - dashboard_enabled: false -clients: - hosts: - client0: {} - client1: {} - client2: {} -mdss: - hosts: - mon0: {} -mgrs: - hosts: - mon0: {} -mons: - hosts: - mon0: {} - mon1: {} - mon2: {} -nfss: - hosts: {} -osds: - hosts: - osd0: {} - osd1: {} - osd2: {} -rbdmirrors: - hosts: {} -rgws: - hosts: - mon0: {} - osd0: {} diff --git a/tests/functional/ooo-collocation/vagrant_variables.yml b/tests/functional/ooo-collocation/vagrant_variables.yml deleted file mode 100644 index 847591200..000000000 --- a/tests/functional/ooo-collocation/vagrant_variables.yml +++ /dev/null @@ -1,60 +0,0 @@ ---- - -# DEPLOY CONTAINERIZED DAEMONS -docker: True - -# DEFINE THE NUMBER OF VMS TO RUN -mon_vms: 3 -osd_vms: 3 -mds_vms: 0 -rgw_vms: 0 -nfs_vms: 0 -grafana_server_vms: 0 -rbd_mirror_vms: 0 -client_vms: 3 -mgr_vms: 0 - -# SUBNETS TO USE FOR THE VMS -public_subnet: 192.168.95 -cluster_subnet: 192.168.96 - -# 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', '/dev/sdc' ]" - -# VAGRANT BOX -# Ceph boxes are *strongly* suggested. They are under better control and will -# not get updated frequently unless required for build systems. These are (for -# 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/stream8 -#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