Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ceph/ceph-ansible
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v6.0.20
Choose a base ref
...
head repository: ceph/ceph-ansible
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: stable-6.0
Choose a head ref
Loading
Showing with 3,429 additions and 1,119 deletions.
  1. +2 −2 .github/workflows/ansible-lint.yml
  2. +1 −1 .github/workflows/pytest.yml
  3. +1 −0 .gitignore
  4. +6 −0 .readthedocs.yaml
  5. +170 −50 Vagrantfile
  6. +2 −2 ceph-ansible.spec.in
  7. +1 −2 docs/source/conf.py
  8. +22 −2 docs/source/index.rst
  9. +2 −2 docs/source/installation/containerized.rst
  10. +60 −0 docs/source/rbdmirror/index.rst
  11. +2 −2 docs/source/testing/tox.rst
  12. +30 −4 group_vars/all.yml.sample
  13. +1 −1 group_vars/mgrs.yml.sample
  14. +2 −16 group_vars/rbdmirrors.yml.sample
  15. +30 −4 group_vars/rhcs.yml.sample
  16. +106 −0 infrastructure-playbooks/backup-and-restore-ceph-files.yml
  17. +131 −60 infrastructure-playbooks/cephadm-adopt.yml
  18. +1 −1 infrastructure-playbooks/cephadm.yml
  19. +9 −1 infrastructure-playbooks/purge-cluster.yml
  20. +11 −0 infrastructure-playbooks/purge-dashboard.yml
  21. +5 −5 infrastructure-playbooks/rolling_update.yml
  22. +22 −2 infrastructure-playbooks/shrink-osd.yml
  23. +17 −2 infrastructure-playbooks/switch-from-non-containerized-to-containerized-ceph-daemons.yml
  24. +7 −13 library/ceph_crush.py
  25. +14 −14 library/ceph_crush_rule.py
  26. +24 −24 library/ceph_dashboard_user.py
  27. +23 −16 library/ceph_ec_profile.py
  28. +22 −22 library/ceph_fs.py
  29. +44 −46 library/ceph_key.py
  30. +6 −6 library/ceph_mgr_module.py
  31. +3 −3 library/ceph_osd.py
  32. +4 −4 library/ceph_osd_flag.py
  33. +91 −63 library/ceph_pool.py
  34. +2 −2 library/cephadm_adopt.py
  35. +14 −4 library/cephadm_bootstrap.py
  36. +378 −0 library/radosgw_caps.py
  37. +0 −2 library/radosgw_user.py
  38. +2 −0 library/radosgw_zone.py
  39. +22 −11 module_utils/ca_common.py
  40. +1 −1 requirements.txt
  41. +7 −0 requirements.yml
  42. +1 −0 roles/ceph-common/tasks/configure_repository.yml
  43. +11 −11 roles/ceph-common/tasks/installs/prerequisite_rhcs_cdn_install.yml
  44. +3 −0 roles/ceph-common/vars/main.yml
  45. +104 −83 roles/ceph-config/tasks/main.yml
  46. +0 −12 roles/ceph-config/templates/ceph.conf.j2
  47. +8 −0 roles/ceph-container-common/tasks/prerequisites.yml
  48. +1 −0 roles/ceph-container-engine/vars/CentOS-9.yml
  49. +8 −3 roles/ceph-crash/templates/ceph-crash.service.j2
  50. +24 −3 roles/ceph-dashboard/tasks/configure_dashboard.yml
  51. +30 −4 roles/ceph-defaults/defaults/main.yml
  52. +1 −1 roles/ceph-facts/tasks/container_binary.yml
  53. +40 −61 roles/ceph-facts/tasks/devices.yml
  54. +2 −1 roles/ceph-facts/tasks/facts.yml
  55. +2 −2 roles/ceph-facts/tasks/get_def_crush_rule_name.yml
  56. +4 −4 roles/ceph-facts/tasks/grafana.yml
  57. +4 −4 roles/ceph-facts/tasks/set_monitor_address.yml
  58. +60 −18 roles/ceph-facts/tasks/set_radosgw_address.yml
  59. +1 −1 roles/ceph-grafana/tasks/configure_grafana.yml
  60. +12 −2 roles/ceph-grafana/templates/grafana-server.service.j2
  61. +1 −1 roles/ceph-handler/handlers/main.yml
  62. +2 −0 roles/ceph-handler/tasks/handler_mdss.yml
  63. +2 −0 roles/ceph-handler/tasks/handler_mgrs.yml
  64. +2 −0 roles/ceph-handler/tasks/handler_mons.yml
  65. +2 −0 roles/ceph-handler/tasks/handler_nfss.yml
  66. +3 −1 roles/ceph-handler/tasks/handler_osds.yml
  67. +2 −0 roles/ceph-handler/tasks/handler_rbdmirrors.yml
  68. +2 −0 roles/ceph-handler/tasks/handler_rgws.yml
  69. +1 −0 roles/ceph-infra/tasks/main.yml
  70. +3 −2 roles/ceph-iscsi-gw/templates/rbd-target-api.service.j2
  71. +3 −2 roles/ceph-iscsi-gw/templates/rbd-target-gw.service.j2
  72. +3 −2 roles/ceph-iscsi-gw/templates/tcmu-runner.service.j2
  73. +6 −3 roles/ceph-mds/templates/ceph-mds.service.j2
  74. +1 −1 roles/ceph-mgr/defaults/main.yml
  75. +1 −1 roles/ceph-mgr/tasks/common.yml
  76. +1 −0 roles/ceph-mgr/tasks/pre_requisite.yml
  77. +6 −3 roles/ceph-mgr/templates/ceph-mgr.service.j2
  78. +7 −5 roles/ceph-mon/templates/ceph-mon.service.j2
  79. +17 −1 roles/ceph-nfs/tasks/pre_requisite_non_container_debian.yml
  80. +5 −3 roles/ceph-nfs/templates/ceph-nfs.service.j2
  81. +8 −5 roles/ceph-node-exporter/templates/node_exporter.service.j2
  82. +2 −2 roles/ceph-osd/tasks/crush_rules.yml
  83. +1 −1 roles/ceph-osd/tasks/main.yml
  84. +2 −2 roles/ceph-osd/tasks/start_osds.yml
  85. +6 −3 roles/ceph-osd/templates/ceph-osd.service.j2
  86. +3 −2 roles/ceph-prometheus/templates/alertmanager.service.j2
  87. +3 −2 roles/ceph-prometheus/templates/prometheus.service.j2
  88. +2 −16 roles/ceph-rbd-mirror/defaults/main.yml
  89. +0 −50 roles/ceph-rbd-mirror/tasks/common.yml
  90. +160 −10 roles/ceph-rbd-mirror/tasks/configure_mirroring.yml
  91. +45 −19 roles/ceph-rbd-mirror/tasks/main.yml
  92. +0 −10 roles/ceph-rbd-mirror/tasks/pre_requisite.yml
  93. +0 −41 roles/ceph-rbd-mirror/tasks/start_rbd_mirror.yml
  94. +5 −3 roles/ceph-rbd-mirror/templates/ceph-rbd-mirror.service.j2
  95. +1 −0 roles/ceph-rgw/tasks/rgw_create_pools.yml
  96. +9 −6 roles/ceph-rgw/templates/ceph-radosgw.service.j2
  97. +1 −1 roles/ceph-validate/tasks/check_iscsi.yml
  98. +3 −6 roles/ceph-validate/tasks/check_rbdmirror.yml
  99. +2 −2 roles/ceph-validate/tasks/check_repository.yml
  100. +2 −16 roles/ceph-validate/tasks/check_system.yml
  101. +1 −1 site-container.yml.sample
  102. +4 −0 tests/conftest.py
  103. +3 −3 tests/functional/add-mdss/container/group_vars/all
  104. +1 −1 tests/functional/add-mdss/container/vagrant_variables.yml
  105. +1 −1 tests/functional/add-mdss/vagrant_variables.yml
  106. +3 −3 tests/functional/add-mgrs/container/group_vars/all
  107. +1 −1 tests/functional/add-mgrs/container/vagrant_variables.yml
  108. +1 −1 tests/functional/add-mgrs/vagrant_variables.yml
  109. +3 −3 tests/functional/add-mons/container/group_vars/all
  110. +1 −1 tests/functional/add-mons/container/vagrant_variables.yml
  111. +1 −1 tests/functional/add-mons/vagrant_variables.yml
  112. +3 −3 tests/functional/add-osds/container/group_vars/all
  113. +1 −1 tests/functional/add-osds/container/vagrant_variables.yml
  114. +1 −1 tests/functional/add-osds/vagrant_variables.yml
  115. +3 −3 tests/functional/add-rbdmirrors/container/group_vars/all
  116. +1 −1 tests/functional/add-rbdmirrors/container/vagrant_variables.yml
  117. +1 −1 tests/functional/add-rbdmirrors/vagrant_variables.yml
  118. +3 −3 tests/functional/add-rgws/container/group_vars/all
  119. +1 −1 tests/functional/add-rgws/container/vagrant_variables.yml
  120. +1 −1 tests/functional/add-rgws/vagrant_variables.yml
  121. +3 −3 tests/functional/all-in-one/container/group_vars/all
  122. +2 −2 tests/functional/all-in-one/container/vagrant_variables.yml
  123. +2 −2 tests/functional/all-in-one/vagrant_variables.yml
  124. +6 −6 tests/functional/all_daemons/container/group_vars/all
  125. +2 −2 tests/functional/all_daemons/container/vagrant_variables.yml
  126. +5 −5 tests/functional/all_daemons/group_vars/all
  127. +1 −1 tests/functional/all_daemons/vagrant_variables.yml
  128. +1 −0 tests/functional/all_daemons_ipv6/Vagrantfile
  129. +40 −0 tests/functional/all_daemons_ipv6/ceph-override.json
  130. +1 −0 tests/functional/all_daemons_ipv6/container/Vagrantfile
  131. +1 −0 tests/functional/all_daemons_ipv6/container/ceph-override.json
  132. +46 −0 tests/functional/all_daemons_ipv6/container/group_vars/all
  133. +13 −0 tests/functional/all_daemons_ipv6/container/group_vars/clients
  134. +2 −0 tests/functional/all_daemons_ipv6/container/group_vars/iscsigws
  135. +11 −0 tests/functional/all_daemons_ipv6/container/group_vars/mons
  136. +8 −0 tests/functional/all_daemons_ipv6/container/group_vars/osds
  137. +8 −0 tests/functional/all_daemons_ipv6/container/group_vars/rgws
  138. +36 −0 tests/functional/all_daemons_ipv6/container/hosts
  139. +61 −0 tests/functional/all_daemons_ipv6/container/vagrant_variables.yml
  140. +39 −0 tests/functional/all_daemons_ipv6/group_vars/all
  141. +13 −0 tests/functional/all_daemons_ipv6/group_vars/clients
  142. +2 −0 tests/functional/all_daemons_ipv6/group_vars/iscsigws
  143. +11 −0 tests/functional/all_daemons_ipv6/group_vars/mons
  144. +10 −0 tests/functional/all_daemons_ipv6/group_vars/nfss
  145. +10 −0 tests/functional/all_daemons_ipv6/group_vars/osds
  146. +9 −0 tests/functional/all_daemons_ipv6/group_vars/rgws
  147. +36 −0 tests/functional/all_daemons_ipv6/hosts
  148. +74 −0 tests/functional/all_daemons_ipv6/vagrant_variables.yml
  149. +2 −2 tests/functional/cephadm/group_vars/all
  150. +1 −1 tests/functional/cephadm/vagrant_variables.yml
  151. +6 −6 tests/functional/collocation/container/group_vars/all
  152. +2 −2 tests/functional/collocation/container/vagrant_variables.yml
  153. +5 −5 tests/functional/collocation/group_vars/all
  154. +2 −2 tests/functional/collocation/vagrant_variables.yml
  155. +6 −6 tests/functional/docker2podman/group_vars/all
  156. +1 −1 tests/functional/docker2podman/vagrant_variables.yml
  157. +3 −3 tests/functional/external_clients/container/inventory/group_vars/all
  158. +2 −2 tests/functional/external_clients/container/vagrant_variables.yml
  159. +2 −2 tests/functional/external_clients/vagrant_variables.yml
  160. +3 −3 tests/functional/filestore-to-bluestore/container/group_vars/all
  161. +1 −1 tests/functional/filestore-to-bluestore/container/vagrant_variables.yml
  162. +1 −1 tests/functional/filestore-to-bluestore/vagrant_variables.yml
  163. +1 −1 tests/functional/infra_lv_create/vagrant_variables.yml
  164. +3 −3 tests/functional/lvm-auto-discovery/container/group_vars/all
  165. +1 −1 tests/functional/lvm-auto-discovery/container/vagrant_variables.yml
  166. +1 −1 tests/functional/lvm-auto-discovery/vagrant_variables.yml
  167. +3 −3 tests/functional/lvm-batch/container/group_vars/all
  168. +1 −1 tests/functional/lvm-batch/container/vagrant_variables.yml
  169. +1 −1 tests/functional/lvm-batch/vagrant_variables.yml
  170. +3 −3 tests/functional/lvm-osds/container/group_vars/all
  171. +1 −1 tests/functional/lvm-osds/container/vagrant_variables.yml
  172. +1 −1 tests/functional/lvm-osds/vagrant_variables.yml
  173. +1 −1 tests/functional/migrate_ceph_disk_to_ceph_volume/vagrant_variables.yml
  174. +2 −2 tests/functional/ooo-collocation/hosts
  175. +2 −2 tests/functional/ooo-collocation/vagrant_variables.yml
  176. +6 −6 tests/functional/podman/group_vars/all
  177. +1 −1 tests/functional/podman/vagrant_variables.yml
  178. +32 −0 tests/functional/rbdmirror.yml
  179. +1 −0 tests/functional/rbdmirror/Vagrantfile
  180. +1 −0 tests/functional/rbdmirror/container/Vagrantfile
  181. +32 −0 tests/functional/rbdmirror/container/group_vars/all
  182. +11 −0 tests/functional/rbdmirror/container/hosts
  183. +1 −0 tests/functional/rbdmirror/container/secondary/Vagrantfile
  184. +32 −0 tests/functional/rbdmirror/container/secondary/group_vars/all
  185. +12 −0 tests/functional/rbdmirror/container/secondary/hosts
  186. +71 −0 tests/functional/rbdmirror/container/secondary/vagrant_variables.yml
  187. +71 −0 tests/functional/rbdmirror/container/vagrant_variables.yml
  188. +27 −0 tests/functional/rbdmirror/group_vars/all
  189. +12 −0 tests/functional/rbdmirror/hosts
  190. +1 −0 tests/functional/rbdmirror/secondary/Vagrantfile
  191. +27 −0 tests/functional/rbdmirror/secondary/group_vars/all
  192. +12 −0 tests/functional/rbdmirror/secondary/hosts
  193. +71 −0 tests/functional/rbdmirror/secondary/vagrant_variables.yml
  194. +71 −0 tests/functional/rbdmirror/vagrant_variables.yml
  195. +2 −2 tests/functional/rgw-multisite/container/group_vars/all
  196. +2 −2 tests/functional/rgw-multisite/container/secondary/group_vars/all
  197. +1 −1 tests/functional/rgw-multisite/container/secondary/vagrant_variables.yml
  198. +1 −1 tests/functional/rgw-multisite/container/vagrant_variables.yml
  199. +1 −1 tests/functional/rgw-multisite/secondary/vagrant_variables.yml
  200. +1 −1 tests/functional/rgw-multisite/vagrant_variables.yml
  201. +11 −0 tests/functional/setup.yml
  202. +3 −3 tests/functional/shrink_mds/container/group_vars/all
  203. +2 −2 tests/functional/shrink_mds/container/vagrant_variables.yml
  204. +1 −1 tests/functional/shrink_mds/vagrant_variables.yml
  205. +3 −3 tests/functional/shrink_mgr/container/group_vars/all
  206. +2 −2 tests/functional/shrink_mgr/container/vagrant_variables.yml
  207. +1 −1 tests/functional/shrink_mgr/vagrant_variables.yml
  208. +3 −3 tests/functional/shrink_mon/container/group_vars/all
  209. +2 −2 tests/functional/shrink_mon/container/vagrant_variables.yml
  210. +1 −1 tests/functional/shrink_mon/vagrant_variables.yml
  211. +3 −3 tests/functional/shrink_osd/container/group_vars/all
  212. +2 −2 tests/functional/shrink_osd/container/vagrant_variables.yml
  213. +1 −1 tests/functional/shrink_osd/vagrant_variables.yml
  214. +3 −3 tests/functional/shrink_rbdmirror/container/group_vars/all
  215. +2 −2 tests/functional/shrink_rbdmirror/container/vagrant_variables.yml
  216. +1 −1 tests/functional/shrink_rbdmirror/vagrant_variables.yml
  217. +3 −3 tests/functional/shrink_rgw/container/group_vars/all
  218. +2 −2 tests/functional/shrink_rgw/container/vagrant_variables.yml
  219. +1 −1 tests/functional/shrink_rgw/vagrant_variables.yml
  220. +6 −6 tests/functional/subset_update/container/group_vars/all
  221. +2 −2 tests/functional/subset_update/container/vagrant_variables.yml
  222. +5 −5 tests/functional/subset_update/group_vars/all
  223. +1 −1 tests/functional/subset_update/vagrant_variables.yml
  224. +3 −0 tests/functional/tests/rbd-mirror/test_rbd_mirror.py
  225. +1 −1 tests/library/test_ceph_crush_rule.py
  226. +12 −5 tests/library/test_ceph_ec_profile.py
  227. +34 −25 tests/library/test_ceph_key.py
  228. +1 −1 tests/library/test_ceph_mgr_module.py
  229. +1 −1 tests/library/test_ceph_osd.py
  230. +1 −1 tests/library/test_ceph_osd_flag.py
  231. +49 −5 tests/library/test_ceph_pool.py
  232. +7 −7 tests/library/test_ceph_volume.py
  233. +1 −1 tests/library/test_ceph_volume_simple_activate.py
  234. +1 −1 tests/library/test_ceph_volume_simple_scan.py
  235. +1 −1 tests/library/test_cephadm_adopt.py
  236. +2 −2 tests/library/test_cephadm_bootstrap.py
  237. +101 −0 tests/library/test_radosgw_caps.py
  238. +1 −0 tests/library/test_radosgw_zone.py
  239. +11 −11 tests/module_utils/test_ca_common.py
  240. +6 −5 tests/requirements.txt
  241. +7 −3 tests/scripts/vagrant_up.sh
  242. +2 −2 tox-cephadm.ini
  243. +1 −1 tox-docker2podman.ini
  244. +4 −3 tox-external_clients.ini
  245. +3 −3 tox-filestore_to_bluestore.ini
  246. +2 −2 tox-podman.ini
  247. +90 −0 tox-rbdmirror.ini
  248. +6 −4 tox-shrink_osd.ini
  249. +8 −10 tox-subset_update.ini
  250. +7 −7 tox-update.ini
  251. +20 −20 tox.ini
4 changes: 2 additions & 2 deletions .github/workflows/ansible-lint.yml
Original file line number Diff line number Diff line change
@@ -10,8 +10,8 @@ jobs:
with:
python-version: '3.8'
architecture: x64
- run: pip install -r <(grep ansible tests/requirements.txt) ansible-lint==4.3.7 netaddr
- run: ansible-lint -x 106,204,205,208 -v --force-color ./roles/*/ ./infrastructure-playbooks/*.yml site-container.yml.sample site-container.yml.sample
- run: pip install -r <(grep ansible tests/requirements.txt) ansible-lint==4.3.7 'rich>=9.5.1,<11.0.0' netaddr
- run: ansible-lint -x 106,204,205,208 -v --force-color ./roles/*/ ./infrastructure-playbooks/*.yml site-container.yml.sample site-container.yml.sample dashboard.yml
- run: ansible-playbook -i ./tests/functional/all_daemons/hosts site.yml.sample --syntax-check --list-tasks -vv
- run: ansible-playbook -i ./tests/functional/all_daemons/hosts site-container.yml.sample --syntax-check --list-tasks -vv
- run: ansible-playbook -i ./tests/functional/all_daemons/hosts infrastructure-playbooks/*.yml --syntax-check --list-tasks -vv
2 changes: 1 addition & 1 deletion .github/workflows/pytest.yml
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ on:
- 'tests/plugins/filter/**.py'
jobs:
build:
runs-on: ubuntu-latest
runs-on: ubuntu-20.04
strategy:
matrix:
python-version: [3.6, 3.7, 3.8]
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -20,3 +20,4 @@ ceph-ansible.spec
!.travis.yml
!.mergify.yml
!raw_install_python.yml
!requirements.yml
6 changes: 6 additions & 0 deletions .readthedocs.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
version: 2

build:
os: "ubuntu-22.04"
tools:
python: "3.9"
Loading