diff --git a/roles/ceph-defaults/tasks/create_ceph_initial_dirs.yml b/roles/ceph-config/tasks/create_ceph_initial_dirs.yml similarity index 100% rename from roles/ceph-defaults/tasks/create_ceph_initial_dirs.yml rename to roles/ceph-config/tasks/create_ceph_initial_dirs.yml diff --git a/roles/ceph-config/tasks/main.yml b/roles/ceph-config/tasks/main.yml index 0e1e4389c..5e5b3526e 100644 --- a/roles/ceph-config/tasks/main.yml +++ b/roles/ceph-config/tasks/main.yml @@ -1,4 +1,7 @@ --- +- name: include create_ceph_initial_dirs.yml + include: create_ceph_initial_dirs.yml + # ceph-common - block: - name: create ceph conf directory diff --git a/roles/ceph-defaults/tasks/main.yml b/roles/ceph-defaults/tasks/main.yml index 3559ee8bd..0d1f7c93c 100644 --- a/roles/ceph-defaults/tasks/main.yml +++ b/roles/ceph-defaults/tasks/main.yml @@ -1,9 +1,3 @@ --- -- name: include check_running_cluster.yml - include_tasks: check_running_cluster.yml - - name: include facts.yml - include_tasks: facts.yml - -- name: include create_ceph_initial_dirs.yml - include_tasks: create_ceph_initial_dirs.yml + include: facts.yml diff --git a/roles/ceph-handler/LICENSE b/roles/ceph-handler/LICENSE new file mode 100644 index 000000000..b0d1c9fc8 --- /dev/null +++ b/roles/ceph-handler/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [2014] [Guillaume Abrioux] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/roles/ceph-handler/README.md b/roles/ceph-handler/README.md new file mode 100644 index 000000000..3145a7f94 --- /dev/null +++ b/roles/ceph-handler/README.md @@ -0,0 +1,2 @@ +# Ansible role: ceph-handler +Documentation is available at http://docs.ceph.com/ceph-ansible/. diff --git a/roles/ceph-defaults/handlers/main.yml b/roles/ceph-handler/handlers/main.yml similarity index 100% rename from roles/ceph-defaults/handlers/main.yml rename to roles/ceph-handler/handlers/main.yml diff --git a/roles/ceph-handler/meta/main.yml b/roles/ceph-handler/meta/main.yml new file mode 100644 index 000000000..acb144c8c --- /dev/null +++ b/roles/ceph-handler/meta/main.yml @@ -0,0 +1,13 @@ +--- +galaxy_info: + author: Sébastien Han + description: Contains handlers for Ceph services + license: Apache + min_ansible_version: 2.3 + platforms: + - name: EL + versions: + - 7 + categories: + - system +dependencies: [] diff --git a/roles/ceph-defaults/tasks/check_running_cluster.yml b/roles/ceph-handler/tasks/check_running_cluster.yml similarity index 100% rename from roles/ceph-defaults/tasks/check_running_cluster.yml rename to roles/ceph-handler/tasks/check_running_cluster.yml diff --git a/roles/ceph-defaults/tasks/check_running_containers.yml b/roles/ceph-handler/tasks/check_running_containers.yml similarity index 100% rename from roles/ceph-defaults/tasks/check_running_containers.yml rename to roles/ceph-handler/tasks/check_running_containers.yml diff --git a/roles/ceph-defaults/tasks/check_socket_non_container.yml b/roles/ceph-handler/tasks/check_socket_non_container.yml similarity index 100% rename from roles/ceph-defaults/tasks/check_socket_non_container.yml rename to roles/ceph-handler/tasks/check_socket_non_container.yml diff --git a/roles/ceph-handler/tasks/main.yml b/roles/ceph-handler/tasks/main.yml new file mode 100644 index 000000000..09280cdee --- /dev/null +++ b/roles/ceph-handler/tasks/main.yml @@ -0,0 +1,3 @@ +--- +- name: include check_running_cluster.yml + include: check_running_cluster.yml \ No newline at end of file diff --git a/roles/ceph-defaults/templates/restart_mds_daemon.sh.j2 b/roles/ceph-handler/templates/restart_mds_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_mds_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_mds_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_mgr_daemon.sh.j2 b/roles/ceph-handler/templates/restart_mgr_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_mgr_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_mgr_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_mon_daemon.sh.j2 b/roles/ceph-handler/templates/restart_mon_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_mon_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_mon_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2 b/roles/ceph-handler/templates/restart_nfs_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_nfs_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_nfs_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_osd_daemon.sh.j2 b/roles/ceph-handler/templates/restart_osd_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_osd_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_osd_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2 b/roles/ceph-handler/templates/restart_rbd_mirror_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_rbd_mirror_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_rbd_mirror_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_rbd_target_api.sh.j2 b/roles/ceph-handler/templates/restart_rbd_target_api.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_rbd_target_api.sh.j2 rename to roles/ceph-handler/templates/restart_rbd_target_api.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_rbd_target_gw.sh.j2 b/roles/ceph-handler/templates/restart_rbd_target_gw.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_rbd_target_gw.sh.j2 rename to roles/ceph-handler/templates/restart_rbd_target_gw.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_rgw_daemon.sh.j2 b/roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_rgw_daemon.sh.j2 rename to roles/ceph-handler/templates/restart_rgw_daemon.sh.j2 diff --git a/roles/ceph-defaults/templates/restart_tcmu_runner.sh.j2 b/roles/ceph-handler/templates/restart_tcmu_runner.sh.j2 similarity index 100% rename from roles/ceph-defaults/templates/restart_tcmu_runner.sh.j2 rename to roles/ceph-handler/templates/restart_tcmu_runner.sh.j2 diff --git a/site-docker.yml.sample b/site-docker.yml.sample index bb5c145d6..7d2e0fb7b 100644 --- a/site-docker.yml.sample +++ b/site-docker.yml.sample @@ -54,6 +54,7 @@ - role: ceph-defaults tags: [with_pkg, fetch_container_image] - role: ceph-validate + - role: ceph-handler - role: ceph-docker-common tags: [with_pkg, fetch_container_image] when: @@ -85,6 +86,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -115,6 +117,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -146,6 +149,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -173,6 +177,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -200,6 +205,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -227,6 +233,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -258,6 +265,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -285,6 +293,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common - role: ceph-config tags: ['ceph_update_config'] @@ -316,6 +325,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-docker-common when: - inventory_hostname == groups.get('clients', ['']) | first @@ -346,7 +356,8 @@ start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" roles: - { role: ceph-defaults, tags: ['ceph_update_config'] } - - { role: ceph-docker-common } + - role: ceph-handler + - ceph-docker-common - { role: ceph-config, tags: ['ceph_update_config'], when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" } - { role: ceph-iscsi-gw, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" } post_tasks: @@ -375,4 +386,4 @@ msg: "{{ ceph_status.stdout_lines }}" delegate_to: "{{ groups['mons'][0] }}" run_once: true - when: not ceph_status.failed \ No newline at end of file + when: not ceph_status.failed diff --git a/site.yml.sample b/site.yml.sample index 3ab96a49c..a8a4342ff 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -91,6 +91,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -118,6 +119,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -149,6 +151,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -176,6 +179,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -203,6 +207,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -230,6 +235,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -257,6 +263,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -288,6 +295,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -319,6 +327,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -346,6 +355,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config'] @@ -375,6 +385,7 @@ roles: - role: ceph-defaults tags: ['ceph_update_config'] + - role: ceph-handler - role: ceph-common - role: ceph-config tags: ['ceph_update_config']