From 4dd51ee3c611ecae6401423f70d58d79c14b659c Mon Sep 17 00:00:00 2001 From: Andrew Schoen Date: Tue, 8 Nov 2016 10:24:36 -0600 Subject: [PATCH] tests: adds a 1mon 1osd xenial test scenario This sets up the osd using journal collocation Signed-off-by: Andrew Schoen Resolves: testing#updates --- .../ubuntu/16.04/mon-osd/Vagrantfile | 1 + .../ubuntu/16.04/mon-osd/group_vars/all | 13 +++++++++++++ .../ubuntu/16.04/mon-osd/group_vars/osds | 4 ++++ tests/functional/ubuntu/16.04/mon-osd/hosts | 5 +++++ .../ubuntu/16.04/mon-osd/scenario.py | 19 +++++++++++++++++++ 5 files changed, 42 insertions(+) create mode 120000 tests/functional/ubuntu/16.04/mon-osd/Vagrantfile create mode 100644 tests/functional/ubuntu/16.04/mon-osd/group_vars/all create mode 100644 tests/functional/ubuntu/16.04/mon-osd/group_vars/osds create mode 100644 tests/functional/ubuntu/16.04/mon-osd/hosts create mode 100644 tests/functional/ubuntu/16.04/mon-osd/scenario.py diff --git a/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile b/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile new file mode 120000 index 000000000..dfd7436c9 --- /dev/null +++ b/tests/functional/ubuntu/16.04/mon-osd/Vagrantfile @@ -0,0 +1 @@ +../../../../../Vagrantfile \ No newline at end of file diff --git a/tests/functional/ubuntu/16.04/mon-osd/group_vars/all b/tests/functional/ubuntu/16.04/mon-osd/group_vars/all new file mode 100644 index 000000000..4e410c37c --- /dev/null +++ b/tests/functional/ubuntu/16.04/mon-osd/group_vars/all @@ -0,0 +1,13 @@ +--- + +ceph_stable: True +public_network: "192.168.42.0/24" +cluster_network: "192.168.43.0/24" +journal_size: 100 +devices: + - '/dev/sdb' + - '/dev/sdc' +journal_collocation: True +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds b/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds new file mode 100644 index 000000000..ed9b23ad1 --- /dev/null +++ b/tests/functional/ubuntu/16.04/mon-osd/group_vars/osds @@ -0,0 +1,4 @@ +--- +os_tuning_params: + - { name: kernel.pid_max, value: 4194303 } + - { name: fs.file-max, value: 26234859 } diff --git a/tests/functional/ubuntu/16.04/mon-osd/hosts b/tests/functional/ubuntu/16.04/mon-osd/hosts new file mode 100644 index 000000000..89721c03e --- /dev/null +++ b/tests/functional/ubuntu/16.04/mon-osd/hosts @@ -0,0 +1,5 @@ +[mons] +mon0 monitor_interface=eth1 + +[osds] +osd0 diff --git a/tests/functional/ubuntu/16.04/mon-osd/scenario.py b/tests/functional/ubuntu/16.04/mon-osd/scenario.py new file mode 100644 index 000000000..b017b8e5a --- /dev/null +++ b/tests/functional/ubuntu/16.04/mon-osd/scenario.py @@ -0,0 +1,19 @@ +# Basic information about ceph and its configuration +ceph = { + 'releases': ['infernalis', 'jewel'], + 'cluster_name': 'ceph' +} + +# remote nodes to test, with anything specific to them that might be useful for +# tests to get. Each one of these can get requested as a py.test fixture to +# validate information. +nodes = { + 'mon0': { + 'username': 'vagrant', + 'components': ['mon', 'mon_initial_members'] + }, + 'osd0': { + 'username': 'vagrant', + 'components': ['mon', 'mon_initial_members'] + } +}