common: add the name of the ceph conf file in the play

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 <seb@redhat.com>

diff --git a/roles/ceph-common/tasks/generate_ceph_conf.yml b/roles/ceph-common/tasks/generate_ceph_conf.yml
index b92d5dc4b9e1faee43406c3a2853ed8f8dd18b88..59fa03c17992cf1c39432093eb53a16e72ab93fc 100644 (file)
--- 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 186c190da312b2104640d81b941afef613f33c5c..4691f65756ed94833df17cfc1ba3a4f3f68b958b 100644 (file)
--- 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 055ae768223a89ba6d1723867a98a293ef94e65d..788a2be994b3e53e530284240dd3ad6832f578d2 100644 (file)
--- 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 (file)
index 601f8f0..0000000
--- 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 b8f77bd29d5c34eeb4fe071d2f6f1f62988f236d..2357d9ee5d01e5cc9d68563c0982b7321c54ac98 100644 (file)
--- 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 (file)
index 1655472..0000000
--- 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 53fce49a838fd0f303dcf072020305203317e859..7ff9feb6604025a887c5bfebae316b22f6053a39 100644 (file)
--- 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 (file)
index 1655472..0000000
--- 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 (file)
index 160a5ec..0000000
--- 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 (file)
index 1068f44..0000000
--- 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 (file)
index 38a71c0..0000000
--- 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 (file)
index 8b69adf..0000000
--- 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']
-    },
-}