mirror of https://github.com/ceph/ceph-ansible.git
09d795b5b7
prior mimic, the data structure returned by `ceph -s -f json` used to
gather information about rbd-mirror daemons looked like below:
```
"servicemap": {
"epoch": 8,
"modified": "2018-07-05 13:21:06.207483",
"services": {
"rbd-mirror": {
"daemons": {
"summary": "",
"ceph-nano-luminous-faa32aebf00b": {
"start_epoch": 8,
"start_stamp": "2018-07-05 13:21:04.668450",
"gid": 14107,
"addr": "172.17.0.2:0/2229952892",
"metadata": {
"arch": "x86_64",
"ceph_version": "ceph version 12.2.5 (cad919881333ac92274171586c827e01f554a70a) luminous (stable)",
"cpu": "Intel(R) Core(TM) i7-4870HQ CPU @ 2.50GHz",
"distro": "centos",
"distro_description": "CentOS Linux 7 (Core)",
"distro_version": "7",
"hostname": "ceph-nano-luminous-faa32aebf00b",
"instance_id": "14107",
"kernel_description": "#1 SMP Wed Mar 14 15:12:16 UTC 2018",
"kernel_version": "4.9.87-linuxkit-aufs",
"mem_swap_kb": "1048572",
"mem_total_kb": "2046652",
"os": "Linux"
}
}
}
}
}
}
```
This part has changed from mimic and became:
```
"servicemap": {
"epoch": 2,
"modified": "2018-07-04 09:54:36.164786",
"services": {
"rbd-mirror": {
"daemons": {
"summary": "",
"14151": {
"start_epoch": 2,
"start_stamp": "2018-07-04 09:54:35.541272",
"gid": 14151,
"addr": "192.168.1.80:0/240942528",
"metadata": {
"arch": "x86_64",
"ceph_release": "mimic",
"ceph_version": "ceph version 13.2.0 (79a10589f1f80dfe21e8f9794365ed98143071c4) mimic (stable)",
"ceph_version_short": "13.2.0",
"cpu": "Intel(R) Xeon(R) CPU X5650 @ 2.67GHz",
"distro": "centos",
"distro_description": "CentOS Linux 7 (Core)",
"distro_version": "7",
"hostname": "ceph-rbd-mirror0",
"id": "ceph-rbd-mirror0",
"instance_id": "14151",
"kernel_description": "#1 SMP Wed May 9 18:05:47 UTC 2018",
"kernel_version": "3.10.0-862.2.3.el7.x86_64",
"mem_swap_kb": "1572860",
"mem_total_kb": "1015548",
"os": "Linux"
}
}
}
}
}
}
```
This patch modifies the function `test_rbd_mirror_is_up()` in
`test_rbd_mirror.py` so it works with `mimic` and keeps backward compatibility
with `luminous`
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
|
||
|---|---|---|
| contrib | ||
| docker | ||
| docs | ||
| group_vars | ||
| infrastructure-playbooks | ||
| library | ||
| plugins | ||
| profiles | ||
| roles | ||
| tests | ||
| .gitignore | ||
| .mergify.yml | ||
| CONTRIBUTING.md | ||
| LICENSE | ||
| Makefile | ||
| README-MULTISITE.md | ||
| README.rst | ||
| Vagrantfile | ||
| ansible.cfg | ||
| ceph-aio-no-vagrant.sh | ||
| ceph-ansible.spec.in | ||
| dummy-ansible-hosts | ||
| example-ansible-role-requirements.yml | ||
| generate_group_vars_sample.sh | ||
| monitor_keys_example | ||
| requirements.txt | ||
| rhcs_edits.txt | ||
| rundep.sample | ||
| rundep_installer.sh | ||
| site-docker.yml.sample | ||
| site.yml.sample | ||
| test.yml | ||
| tox.ini | ||
| vagrant_variables.yml.atomic | ||
| vagrant_variables.yml.linode | ||
| vagrant_variables.yml.openstack | ||
| vagrant_variables.yml.sample | ||
README.rst
ceph-ansible ============ Ansible playbooks for Ceph, the distributed filesystem. Please refer to our hosted documentation here: http://docs.ceph.com/ceph-ansible/master/ You can view documentation for our ``stable-*`` branches by substituting ``master`` in the link above for the name of the branch. For example: http://docs.ceph.com/ceph-ansible/stable-3.0/