ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/1153/head
Sébastien Han 2016-12-07 18:22:39 +01:00
parent a8ca0da5ad
commit f0687995e1
12 changed files with 2 additions and 195 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/ceph-common/tasks/generate_ceph_conf.yml
View File

@ -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

1
roles/ceph-common/tasks/main.yml
View File

@ -1,6 +1,5 @@
---
- include: ./checks/check_system.yml
- include: ./checks/check_mandatory_vars.yml
# Set ceph_release

2
roles/ceph-mon/tasks/docker/create_configs.yml
View File

@ -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"

36
tests/functional/centos/7/cluster/scenario.py
View File

@ -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': []
},
}

1
tests/functional/centos/7/dmcrypt-dedicated-journal/group_vars/all
View File

@ -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

19
tests/functional/centos/7/dmcrypt-dedicated-journal/scenario.py
View File

@ -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': [],
},
}

1
tests/functional/centos/7/dmcrypt-journal-collocation/group_vars/all
View File

@ -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

19
tests/functional/centos/7/dmcrypt-journal-collocation/scenario.py
View File

@ -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': [],
},
}

36
tests/functional/centos/7/docker-cluster/scenario.py
View File

@ -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': []
},
}

20
tests/functional/centos/7/journal-collocation/scenario.py
View File

@ -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'],
},
}

36
tests/functional/ubuntu/16.04/cluster/scenario.py
View File

@ -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': []
},
}

24
tests/scenarios/example.py
View File

@ -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']
},
}