Remove support for ceph-ansible fetch directory
The state information in the ceph-ansible fetch directory
is no longer necessary to replace a Ceph monitor as of
ceph-ansible 4.0.14-1. Stein, Train, Ussuri and newer
should be using this version of ceph-ansible or newer.
TripleO does not need to do extra work to maintain the
fetch directory.
Add SwiftFetchDirGetTempurl, SwiftFetchDirPutTempurl, and
LocalCephAnsibleFetchDirectoryBackup to the deprecated list
of parameters and modify code to not use these parameters.
Remove call to tripleo-ansible/tripleo_ceph_fetch_dir role.
Update tripleo-common/workbooks/plan_management.yaml to not
create SwiftFetchDirGetTempurl and SwiftFetchDirPutTempurl
during deployment and update via depends-on patch.
Unlclean cherry pick; required manual changes.
Depends-On: I167449e4d7e38f0f5fd74251a3bd8f5b0b31451b
Change-Id: I3f8c2571a6dd35029d71dd42df637a962d9b3235
Closes-bug: #1863809
Closes-Bug: #1865357
(cherry picked from commit b656f523cf
)
This commit is contained in:
parent
267b026ab1
commit
5ac7a8c498
|
@ -57,8 +57,6 @@ parameter_defaults:
|
|||
|
||||
|
||||
Debug: true
|
||||
# fetch dir needed for standalone
|
||||
LocalCephAnsibleFetchDirectoryBackup: /var/lib/ceph_ansible_fetch
|
||||
CephAnsibleDisksConfig:
|
||||
osd_objectstore: bluestore
|
||||
osd_scenario: lvm
|
||||
|
|
|
@ -35,8 +35,6 @@ resource_registry:
|
|||
parameter_defaults:
|
||||
ManagePolling: true
|
||||
Debug: true
|
||||
# fetch dir needed for standalone
|
||||
LocalCephAnsibleFetchDirectoryBackup: /var/lib/ceph_ansible_fetch
|
||||
CephAnsibleDisksConfig:
|
||||
osd_objectstore: bluestore
|
||||
osd_scenario: lvm
|
||||
|
|
|
@ -38,8 +38,6 @@ parameter_defaults:
|
|||
AB4114B1-9C9D-409A-BEFB-D88C151BF2C3: {"foo": "bar"}
|
||||
8CF1A7EA-7B4B-4433-AC83-17675514B1B8: {"foo2": "bar2"}
|
||||
Debug: true
|
||||
# fetch dir needed for standalone
|
||||
LocalCephAnsibleFetchDirectoryBackup: /var/lib/ceph_ansible_fetch
|
||||
CephAnsibleDisksConfig:
|
||||
osd_objectstore: bluestore
|
||||
osd_scenario: lvm
|
||||
|
|
|
@ -151,13 +151,14 @@ parameters:
|
|||
ManilaCephFSMetadataPoolName:
|
||||
default: manila_metadata
|
||||
type: string
|
||||
# DEPRECATED options for compatibility with older versions
|
||||
# start DEPRECATED options for compatibility with older versions
|
||||
ManilaCephFSDataPoolPGNum:
|
||||
default: 128
|
||||
type: number
|
||||
ManilaCephFSMetadataPoolPGNum:
|
||||
default: 128
|
||||
type: number
|
||||
# end DEPRECATED options for compatibility with older versions
|
||||
ManilaCephFSShareBackendName:
|
||||
default: cephfs
|
||||
type: string
|
||||
|
@ -189,6 +190,7 @@ parameters:
|
|||
default: {}
|
||||
description: Mapping of Ansible environment variables to override defaults.
|
||||
type: json
|
||||
# start DEPRECATED options for compatibility with older versions
|
||||
SwiftFetchDirGetTempurl:
|
||||
default: ''
|
||||
description: A temporary Swift URL to download the fetch_directory from.
|
||||
|
@ -206,6 +208,7 @@ parameters:
|
|||
config-download, e.g. the mistral user in the mistral-executor
|
||||
container is able to read/write to /var/lib/mistral/ceph_fetch
|
||||
type: string
|
||||
# end DEPRECATED options for compatibility with older versions
|
||||
CephOsdPercentageMin:
|
||||
default: 66
|
||||
description: The minimum percentage of Ceph OSDs which must be running and
|
||||
|
@ -281,6 +284,9 @@ parameter_groups:
|
|||
parameters:
|
||||
- ManilaCephFSDataPoolPGNum
|
||||
- ManilaCephFSMetadataPoolPGNum
|
||||
- LocalCephAnsibleFetchDirectoryBackup
|
||||
- SwiftFetchDirGetTempurl
|
||||
- SwiftFetchDirPutTempurl
|
||||
|
||||
conditions:
|
||||
deprecated_data_pool_pgnum: {not: {equals: [{get_param: ManilaCephFSDataPoolPGNum}, 128]}}
|
||||
|
@ -607,6 +613,9 @@ outputs:
|
|||
expression: dict($.data.keys().select($.toLower()).zip($.data.values()))
|
||||
data: {get_param: NodeDataLookup}
|
||||
ceph_external_multi_config: {get_param: CephExternalMultiConfig}
|
||||
- name: include common ceph defaults
|
||||
include_role:
|
||||
name: tripleo-ceph-common
|
||||
- name: create ceph-ansible working direcotry
|
||||
include_role:
|
||||
name: tripleo-ceph-work-dir
|
||||
|
@ -623,9 +632,6 @@ outputs:
|
|||
set_fact:
|
||||
ceph_ansible_playbook_verbosity: {get_param: CephAnsiblePlaybookVerbosity}
|
||||
ceph_ansible_playbooks_param: {get_param: CephAnsiblePlaybook}
|
||||
local_ceph_ansible_fetch_directory_backup: {get_param: LocalCephAnsibleFetchDirectoryBackup}
|
||||
swift_get_url: {get_param: SwiftFetchDirGetTempurl}
|
||||
swift_put_url: {get_param: SwiftFetchDirPutTempurl}
|
||||
ceph_ansible_environment_variables:
|
||||
yaql:
|
||||
data: {get_param: CephAnsibleEnvironmentVariables}
|
||||
|
@ -639,17 +645,9 @@ outputs:
|
|||
include_role:
|
||||
name: tripleo-ceph-uuid
|
||||
tasks_from: gather
|
||||
- name: create copy of ceph-ansible fetch directory
|
||||
include_role:
|
||||
name: tripleo-ceph-fetch-dir
|
||||
tasks_from: create
|
||||
- name: run ceph-ansible
|
||||
include_role:
|
||||
name: tripleo-ceph-run-ansible
|
||||
- name: backup and clean fetch directory
|
||||
include_role:
|
||||
name: tripleo-ceph-fetch-dir
|
||||
tasks_from: backup_and_clean
|
||||
- name: ensure ceph health is OK before proceeding
|
||||
import_role:
|
||||
role: ceph
|
||||
|
|
Loading…
Reference in New Issue