-
Notifications
You must be signed in to change notification settings - Fork 675
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
ceph-ansible has undergone significant refactoring in their v3 development, adding new required roles such as ceph-defaults and ceph-config, which are used to provide vars and configuration to the ceph service roles. These roles must be executed before the service roles to avoid missing vars[1][2]. During the v3 refactoring, ceph-common was removed as a galaxy-style role dependency in the service roles meta files[3]. This means we will need to explicitly execute ceph-common from now on also. This change adds the defaults and config roles and executes them. Also some minor cleanup such as alphabetizing the OpenStack roles list is done. Also added is an upgrade playbook, reno, and docs to assist in cleaning up the older galaxy-named ceph common roles which are no longer galaxy namespaced in our cloning configuration. [1] http://jenkins-logs.objects-us-dfw-1.cloud.lstn.net/osa-ci/490192/1/21/logs/console.log [2] ceph/ceph-ansible#1737 [3] ceph/ceph-ansible#1727 Change-Id: Ia8c0cb0a23f331fce7914afbfc05ef54ee3ffb0e
- Loading branch information
Showing
10 changed files
with
144 additions
and
36 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
--- | ||
upgrade: | ||
- The ceph-ansible integration has been updated to support the ceph-ansible | ||
v3.0 series tags. The new v3.0 series brings a significant refactoring of | ||
the ceph-ansible roles and vars, so it is strongly recommended to consult | ||
the upstream `ceph-ansible documentation | ||
<http://docs.ceph.com/ceph-ansible/master/>`_ to perform any required | ||
vars migrations before you upgrade. | ||
critical: | ||
- The ceph-ansible integration has been updated to support the ceph-ansible | ||
v3.0 series tags. The new v3.0 series brings a significant refactoring of | ||
the ceph-ansible roles and vars, so it is strongly recommended to consult | ||
the upstream `ceph-ansible documentation | ||
<http://docs.ceph.com/ceph-ansible/master/>`_ to perform any required | ||
vars migrations before you upgrade. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
--- | ||
upgrade: | ||
- The ceph-ansible common roles are no longer namespaced with a galaxy-style | ||
'.' (ie. ``ceph.ceph-common`` is now cloned as ``ceph-common``), due to a | ||
change in the way upstream meta dependencies are handled in the ceph roles. | ||
The roles will be cloned according to the new naming, and an upgrade | ||
playbook ``ceph-galaxy-removal.yml`` has been added to clean up the stale | ||
galaxy-named roles. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
31 changes: 31 additions & 0 deletions
31
scripts/upgrade-utilities/playbooks/ceph-galaxy-removal.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,31 @@ | ||
--- | ||
# Copyright 2017, Logan Vig <logan2211@gmail.com> | ||
# | ||
# 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. | ||
|
||
- name: Remove the ceph galaxy named roles | ||
hosts: localhost | ||
gather_facts: true | ||
user: root | ||
tasks: | ||
# These roles used to be named using galaxy format due to the naming of the | ||
# meta dependencies in ceph-ansible. Now the meta dependencies no longer | ||
# exist so we are free to name them more consistently with the rest of | ||
# OSA's roles. | ||
- name: Remove ceph galaxy named roles if found | ||
file: | ||
path: "/etc/ansible/roles/{{ item }}" | ||
state: "absent" | ||
with_items: | ||
- ceph.ceph-docker-common | ||
- ceph.ceph-common |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters