From f0687995e1d73b37b676708a7ad6e17fb4a71f96 Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Wed, 7 Dec 2016 18:22:39 +0100 Subject: [PATCH] common: add the name of the ceph conf file in the play MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Just for clarity and because we can we now show the name of the ceph configuration file that is generated. Signed-off-by: Sébastien Han --- .../ceph-common/tasks/generate_ceph_conf.yml | 2 +- roles/ceph-common/tasks/main.yml | 1 - .../ceph-mon/tasks/docker/create_configs.yml | 2 +- tests/functional/centos/7/cluster/scenario.py | 36 ------------------- .../dmcrypt-dedicated-journal/group_vars/all | 1 - .../7/dmcrypt-dedicated-journal/scenario.py | 19 ---------- .../group_vars/all | 1 - .../7/dmcrypt-journal-collocation/scenario.py | 19 ---------- .../centos/7/docker-cluster/scenario.py | 36 ------------------- .../centos/7/journal-collocation/scenario.py | 20 ----------- .../ubuntu/16.04/cluster/scenario.py | 36 ------------------- tests/scenarios/example.py | 24 ------------- 12 files changed, 2 insertions(+), 195 deletions(-) delete mode 100644 tests/functional/centos/7/cluster/scenario.py delete mode 100644 tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py delete mode 100644 tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py delete mode 100644 tests/functional/centos/7/docker-cluster/scenario.py delete mode 100644 tests/functional/centos/7/journal-collocation/scenario.py delete mode 100644 tests/functional/ubuntu/16.04/cluster/scenario.py delete mode 100644 tests/scenarios/example.py diff --git a/roles/ceph-common/tasks/generate_ceph_conf.yml b/roles/ceph-common/tasks/generate_ceph_conf.yml index b92d5dc4b..59fa03c17 100644 --- a/roles/ceph-common/tasks/generate_ceph_conf.yml +++ b/roles/ceph-common/tasks/generate_ceph_conf.yml @@ -7,7 +7,7 @@ group: "{{ dir_group }}" mode: "{{ dir_mode }}" -- name: generate ceph configuration file +- name: "generate ceph configuration file: {{ cluster }}.conf" action: config_template args: src: ceph.conf.j2 diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 186c190da..4691f6575 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -1,6 +1,5 @@ --- - include: ./checks/check_system.yml - - include: ./checks/check_mandatory_vars.yml # Set ceph_release diff --git a/roles/ceph-mon/tasks/docker/create_configs.yml b/roles/ceph-mon/tasks/docker/create_configs.yml index 055ae7682..788a2be99 100644 --- a/roles/ceph-mon/tasks/docker/create_configs.yml +++ b/roles/ceph-mon/tasks/docker/create_configs.yml @@ -22,7 +22,7 @@ become: false when: generate_fsid -- name: generate ceph configuration file +- name: "generate {{ cluster }}.conf configuration file" action: config_template args: src: "{{ playbook_dir }}/roles/ceph-common/templates/ceph.conf.j2" diff --git a/tests/functional/centos/7/cluster/scenario.py b/tests/functional/centos/7/cluster/scenario.py deleted file mode 100644 index 601f8f03d..000000000 --- a/tests/functional/centos/7/cluster/scenario.py +++ /dev/null @@ -1,36 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'test', - 'subnet': '192.168.1', -} - -# 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': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [] - }, - 'mds0': { - 'username': 'vagrant', - 'components': [] - }, - 'rgw0': { - 'username': 'vagrant', - 'components': [] - }, -} diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all index b8f77bd29..2357d9ee5 100644 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all +++ b/tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all @@ -1,7 +1,6 @@ --- ceph_stable: True -cluster: test public_network: "192.168.11.0/24" cluster_network: "192.168.12.0/24" journal_size: 100 diff --git a/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py b/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py deleted file mode 100644 index 165547295..000000000 --- a/tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py +++ /dev/null @@ -1,19 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'test' -} - -# 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': [], - }, -} diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all index 53fce49a8..7ff9feb66 100644 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all +++ b/tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all @@ -1,7 +1,6 @@ --- ceph_stable: True -cluster: test public_network: "192.168.13.0/24" cluster_network: "192.168.14.0/24" journal_size: 100 diff --git a/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py b/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py deleted file mode 100644 index 165547295..000000000 --- a/tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py +++ /dev/null @@ -1,19 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'test' -} - -# 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': [], - }, -} diff --git a/tests/functional/centos/7/docker-cluster/scenario.py b/tests/functional/centos/7/docker-cluster/scenario.py deleted file mode 100644 index 160a5ecd4..000000000 --- a/tests/functional/centos/7/docker-cluster/scenario.py +++ /dev/null @@ -1,36 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'test', - 'subnet': '192.168.15', -} - -# 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': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [] - }, - 'mds0': { - 'username': 'vagrant', - 'components': [] - }, - 'rgw0': { - 'username': 'vagrant', - 'components': [] - }, -} diff --git a/tests/functional/centos/7/journal-collocation/scenario.py b/tests/functional/centos/7/journal-collocation/scenario.py deleted file mode 100644 index 1068f4405..000000000 --- a/tests/functional/centos/7/journal-collocation/scenario.py +++ /dev/null @@ -1,20 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'test' -} - -# 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': ['collocated_journals'], - 'devices': ['/dev/sda', '/dev/sdb'], - }, -} diff --git a/tests/functional/ubuntu/16.04/cluster/scenario.py b/tests/functional/ubuntu/16.04/cluster/scenario.py deleted file mode 100644 index 38a71c045..000000000 --- a/tests/functional/ubuntu/16.04/cluster/scenario.py +++ /dev/null @@ -1,36 +0,0 @@ -# Basic information about ceph and its configuration -ceph = { - 'releases': ['infernalis', 'jewel'], - 'cluster_name': 'test', - 'subnet': '192.168.5', -} - -# 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': ['conf_tests'] - }, - 'mon1': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'mon2': { - 'username': 'vagrant', - 'components': ['conf_tests'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': [] - }, - 'mds0': { - 'username': 'vagrant', - 'components': [] - }, - 'rgw0': { - 'username': 'vagrant', - 'components': [] - }, -} diff --git a/tests/scenarios/example.py b/tests/scenarios/example.py deleted file mode 100644 index 8b69adf22..000000000 --- a/tests/scenarios/example.py +++ /dev/null @@ -1,24 +0,0 @@ -# This is the most basic tests that can be executed remotely. It will trigger -# a series of checks for paths, permissions and flags. Whatever is not -# dependant on particular component of ceph should go here (for example, -# nothing related to just OSDs) - -# Basic information about ceph and its configuration -ceph = { - 'releases': ['jewel', 'infernalis'], - 'cluster_name': 'test' -} - -# 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'] - }, - 'osd0': { - 'username': 'vagrant', - 'components': ['osd'] - }, -} -- 2.39.5