From 81de8a81066febb6b7ea93415a44e8473eacc13f Mon Sep 17 00:00:00 2001 From: Dimitri Savineau Date: Tue, 28 May 2019 10:55:03 -0400 Subject: [PATCH] remove ceph-agent role and references The ceph-agent role was used only for RHCS 2 (jewel) so it's not usefull anymore. The current code will fail on CentOS distribution because the rhscon package is only avaible on Red Hat with the RHCS 2 repository and this ceph release is supported on stable-3.0 branch. Resolves: #4020 Signed-off-by: Dimitri Savineau (cherry picked from commit 7503098ca079b200b3adcb1faf2e255d9c74a581) --- .gitignore | 1 - CONTRIBUTING.md | 1 - generate_group_vars_sample.sh | 2 - group_vars/agent.yml.sample | 19 -- infrastructure-playbooks/gather-ceph-logs.yml | 1 - .../take-over-existing-cluster.yml | 1 - plugins/callback/installer_checkpoint.py | 5 - roles/ceph-agent/LICENSE | 201 ------------------ roles/ceph-agent/README.md | 3 - roles/ceph-agent/defaults/main.yml | 10 - roles/ceph-agent/tasks/main.yml | 6 - roles/ceph-agent/tasks/start_agent.yml | 6 - roles/ceph-agent/templates/ceph_agent.j2 | 2 - site-docker.yml.sample | 1 - site.yml.sample | 32 --- 15 files changed, 291 deletions(-) delete mode 100644 group_vars/agent.yml.sample delete mode 100644 roles/ceph-agent/LICENSE delete mode 100644 roles/ceph-agent/README.md delete mode 100644 roles/ceph-agent/defaults/main.yml delete mode 100644 roles/ceph-agent/tasks/main.yml delete mode 100644 roles/ceph-agent/tasks/start_agent.yml delete mode 100644 roles/ceph-agent/templates/ceph_agent.j2 diff --git a/.gitignore b/.gitignore index 4f0ef0db6..ca0a10222 100644 --- a/.gitignore +++ b/.gitignore @@ -9,7 +9,6 @@ group_vars/osds group_vars/mdss group_vars/rgws group_vars/restapis -group_vars/agent group_vars/*.yml *.DS_Store /*.yml diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index c80afd8db..19d4c8b10 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -45,7 +45,6 @@ It means if you are pushing a patch modifying one of these files: - `./roles/ceph-mgr/defaults/main.yml` - `./roles/ceph-fetch-keys/defaults/main.yml` - `./roles/ceph-rbd-mirror/defaults/main.yml` -- `./roles/ceph-agent/defaults/main.yml` - `./roles/ceph-defaults/defaults/main.yml` - `./roles/ceph-osd/defaults/main.yml` - `./roles/ceph-nfs/defaults/main.yml` diff --git a/generate_group_vars_sample.sh b/generate_group_vars_sample.sh index 6808d23c6..20ae5a45f 100755 --- a/generate_group_vars_sample.sh +++ b/generate_group_vars_sample.sh @@ -62,8 +62,6 @@ for role in "$basedir"/roles/ceph-*; do if [[ $rolename == "ceph-defaults" ]]; then output="all.yml.sample rhcs.yml.sample" - elif [[ $rolename == "ceph-agent" ]]; then - output="agent.yml.sample" elif [[ $rolename == "ceph-fetch-keys" ]]; then output="ceph-fetch-keys.yml.sample" elif [[ $rolename == "ceph-rbd-mirror" ]]; then diff --git a/group_vars/agent.yml.sample b/group_vars/agent.yml.sample deleted file mode 100644 index 4b9fbda0d..000000000 --- a/group_vars/agent.yml.sample +++ /dev/null @@ -1,19 +0,0 @@ ---- -# Variables here are applicable to all host groups NOT roles - -# This sample file generated by generate_group_vars_sample.sh - -# Dummy variable to avoid error because ansible does not recognize the -# file as a good configuration file when no variable in it. -dummy: - -# You can override vars by using host or group vars - -########### -# GENERAL # -########### - -# The agent needs an agent_master_host variable defined so that it can connect -# and push information back to it -#agent_master_host: "localhost" - diff --git a/infrastructure-playbooks/gather-ceph-logs.yml b/infrastructure-playbooks/gather-ceph-logs.yml index 830c2ab83..8775c097f 100644 --- a/infrastructure-playbooks/gather-ceph-logs.yml +++ b/infrastructure-playbooks/gather-ceph-logs.yml @@ -1,6 +1,5 @@ - hosts: - mons - - agents - osds - mdss - rgws diff --git a/infrastructure-playbooks/take-over-existing-cluster.yml b/infrastructure-playbooks/take-over-existing-cluster.yml index 64aae9666..88b8d843b 100644 --- a/infrastructure-playbooks/take-over-existing-cluster.yml +++ b/infrastructure-playbooks/take-over-existing-cluster.yml @@ -19,7 +19,6 @@ - hosts: - mons - - agents - osds - mdss - rgws diff --git a/plugins/callback/installer_checkpoint.py b/plugins/callback/installer_checkpoint.py index 65e4967f3..cacc6fb96 100644 --- a/plugins/callback/installer_checkpoint.py +++ b/plugins/callback/installer_checkpoint.py @@ -23,7 +23,6 @@ class CallbackModule(CallbackBase): installer_phases = [ 'installer_phase_ceph_mon', 'installer_phase_ceph_mgr', - 'installer_phase_ceph_agent', 'installer_phase_ceph_osd', 'installer_phase_ceph_mds', 'installer_phase_ceph_rgw', @@ -44,10 +43,6 @@ class CallbackModule(CallbackBase): 'title': 'Install Ceph Manager', 'playbook': 'roles/ceph-mgr/tasks/main.yml' }, - 'installer_phase_ceph_agent': { - 'title': 'Install Ceph Agent', - 'playbook': 'roles/ceph-agent/tasks/main.yml' - }, 'installer_phase_ceph_osd': { 'title': 'Install Ceph OSD', 'playbook': 'roles/ceph-osd/tasks/main.yml' diff --git a/roles/ceph-agent/LICENSE b/roles/ceph-agent/LICENSE deleted file mode 100644 index acee72b2b..000000000 --- a/roles/ceph-agent/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - 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] [Sébastien Han] - - 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-agent/README.md b/roles/ceph-agent/README.md deleted file mode 100644 index bd6d64a10..000000000 --- a/roles/ceph-agent/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Ansible role: ceph-agent - -Documentation is available at http://docs.ceph.com/ceph-ansible/. diff --git a/roles/ceph-agent/defaults/main.yml b/roles/ceph-agent/defaults/main.yml deleted file mode 100644 index 0adfd3347..000000000 --- a/roles/ceph-agent/defaults/main.yml +++ /dev/null @@ -1,10 +0,0 @@ ---- -# You can override vars by using host or group vars - -########### -# GENERAL # -########### - -# The agent needs an agent_master_host variable defined so that it can connect -# and push information back to it -agent_master_host: "localhost" diff --git a/roles/ceph-agent/tasks/main.yml b/roles/ceph-agent/tasks/main.yml deleted file mode 100644 index 2c252c96a..000000000 --- a/roles/ceph-agent/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: include pre_requisite.yml - include_tasks: pre_requisite.yml - -- name: include start_agent.yml - include_tasks: start_agent.yml diff --git a/roles/ceph-agent/tasks/start_agent.yml b/roles/ceph-agent/tasks/start_agent.yml deleted file mode 100644 index 3723e4a2b..000000000 --- a/roles/ceph-agent/tasks/start_agent.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- name: enable and start the agent - service: - name: salt-minion - state: started - enabled: yes diff --git a/roles/ceph-agent/templates/ceph_agent.j2 b/roles/ceph-agent/templates/ceph_agent.j2 deleted file mode 100644 index 220338e63..000000000 --- a/roles/ceph-agent/templates/ceph_agent.j2 +++ /dev/null @@ -1,2 +0,0 @@ -# {{ ansible_managed }} -master: {{ agent_master_host }} diff --git a/site-docker.yml.sample b/site-docker.yml.sample index 82099535f..60b343196 100644 --- a/site-docker.yml.sample +++ b/site-docker.yml.sample @@ -3,7 +3,6 @@ - hosts: - mons - - agents - osds - mdss - rgws diff --git a/site.yml.sample b/site.yml.sample index 06867dfed..cdd37a324 100644 --- a/site.yml.sample +++ b/site.yml.sample @@ -3,7 +3,6 @@ - hosts: - mons - - agents - osds - mdss - rgws @@ -141,37 +140,6 @@ status: "Complete" end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" -- hosts: agents - gather_facts: false - become: True - any_errors_fatal: true - pre_tasks: - - name: set ceph agent install 'In Progress' - run_once: true - set_stats: - data: - installer_phase_ceph_agent: - status: "In Progress" - start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" - roles: - - role: ceph-defaults - tags: ['ceph_update_config'] - - role: ceph-facts - tags: ['ceph_update_config'] - - role: ceph-handler - - role: ceph-common - - role: ceph-config - tags: ['ceph_update_config'] - - role: ceph-agent - post_tasks: - - name: set ceph agent install 'Complete' - run_once: true - set_stats: - data: - installer_phase_ceph_agent: - status: "Complete" - end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}" - - hosts: osds gather_facts: false become: True