Remove deprecated ceph-base parameters
Remove paramters which were deprecated in Wallaby. Most of these are relics of ceph-ansible which has been replaced by cephadm. List of removed parameters: LocalCephAnsibleFetchDirectoryBackup SwiftFetchDirGetTempurl SwiftFetchDirPutTempurl CephIPv6 CephAnsibleEnvironmentVariables CephAnsibleExtraConfig CephAnsiblePlaybook CephAnsiblePlaybookVerbosity CephAnsibleRepo CephAnsibleSkipTags CephAnsibleSkipClient CephAnsibleWarning CephOsdPercentageMin Change-Id: I4905c393554941d32f8caada925f0be3f4aefdce
This commit is contained in:
parent
26cbbd5f0c
commit
5a3f0f3362
@ -24,5 +24,4 @@ parameter_defaults:
|
||||
Debug: true
|
||||
DockerPuppetDebug: True
|
||||
NotificationDriver: 'noop'
|
||||
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
|
||||
ContainerCli: podman
|
||||
|
@ -178,5 +178,4 @@ resource_registry:
|
||||
parameter_defaults:
|
||||
Debug: true
|
||||
NotificationDriver: 'noop'
|
||||
CephAnsibleRepo: "tripleo-centos-ceph-nautilus"
|
||||
ContainerCli: podman
|
||||
|
@ -211,7 +211,6 @@ parameter_defaults:
|
||||
mon_warn_on_insecure_global_id_reclaim_allowed: false
|
||||
NfsUrl: 127.0.0.1
|
||||
CephMsgrSecureMode: true
|
||||
CephAnsibleSkipClient: false
|
||||
CephConfigPath: "/etc/ceph"
|
||||
DisableCephadm: true
|
||||
LVMFilterEnabled: true
|
||||
|
@ -190,9 +190,6 @@ parameters:
|
||||
hidden: true
|
||||
constraints:
|
||||
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||
CephIPv6:
|
||||
default: False
|
||||
type: boolean
|
||||
SwiftPassword:
|
||||
description: The password for the swift service account
|
||||
type: string
|
||||
@ -200,75 +197,6 @@ parameters:
|
||||
ContainerCephDaemonImage:
|
||||
description: image
|
||||
type: string
|
||||
# start DEPRECATED options for compatibility with older versions
|
||||
CephAnsiblePlaybookVerbosity:
|
||||
default: 1
|
||||
description: The number of '-v', '-vv', etc. passed to ansible-playbook command
|
||||
type: number
|
||||
constraints:
|
||||
- range: { min: 1, max: 5 }
|
||||
CephAnsibleEnvironmentVariables:
|
||||
default: {}
|
||||
description: Mapping of Ansible environment variables to override defaults.
|
||||
type: json
|
||||
SwiftFetchDirGetTempurl:
|
||||
default: ''
|
||||
description: A temporary Swift URL to download the fetch_directory from.
|
||||
type: string
|
||||
SwiftFetchDirPutTempurl:
|
||||
default: ''
|
||||
description: A temporary Swift URL to upload the fetch_directory to.
|
||||
type: string
|
||||
LocalCephAnsibleFetchDirectoryBackup:
|
||||
default: ''
|
||||
description: Filesystem path on undercloud to persist a copy of the data
|
||||
from the ceph-ansible fetch directory. Used as an alternative
|
||||
to backing up the fetch_directory in Swift. Path must be
|
||||
writable and readable by the user running ansible from
|
||||
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
|
||||
CephOsdPercentageMin:
|
||||
default: 0
|
||||
description: The minimum percentage of Ceph OSDs which must be running and
|
||||
in the Ceph cluster, according to ceph osd stat, for the
|
||||
deployment not to fail. Used to catch deployment errors early.
|
||||
Set this value to 0 to disable this check. Deprecated in Wallaby
|
||||
because of the move from ceph-ansible to cephadm; the later only
|
||||
brings up OSDs out of band and deployment does not block while
|
||||
waiting for them to come up, thus we cannot do this anymore.
|
||||
type: number
|
||||
CephAnsiblePlaybook:
|
||||
type: comma_delimited_list
|
||||
description: >
|
||||
List of paths to the ceph-ansible playbooks to execute. If not
|
||||
specified, the playbook will be determined automatically
|
||||
depending on type of operation being performed
|
||||
(deploy/update/upgrade).
|
||||
default: ['default']
|
||||
CephAnsibleExtraConfig:
|
||||
type: json
|
||||
description: Extra vars for the ceph-ansible playbook
|
||||
default: {}
|
||||
CephAnsibleSkipTags:
|
||||
type: string
|
||||
description: List of ceph-ansible tags to skip
|
||||
default: 'package-install,with_pkg'
|
||||
CephAnsibleRepo:
|
||||
type: string
|
||||
description: |
|
||||
The repository that should be used to install the right ceph-ansible
|
||||
package. This value can be used by tripleo-validations to double check
|
||||
the right ceph-ansible version is installed.
|
||||
default: 'centos-ceph-nautilus'
|
||||
CephAnsibleWarning:
|
||||
type: boolean
|
||||
description: |
|
||||
In particular scenarios we want this validation to show the warning but
|
||||
don't fail because the package is installed on the system but repos are
|
||||
disabled.
|
||||
default: true
|
||||
# end DEPRECATED options for compatibility with older versions
|
||||
ContainerImageRegistryCredentials:
|
||||
type: json
|
||||
hidden: true
|
||||
@ -325,12 +253,6 @@ parameters:
|
||||
default: "{{ playbook_dir }}/cephadm/ceph_client.yml"
|
||||
type: string
|
||||
description: The undercloud path where cephadm exports the Ceph Client configuration.
|
||||
CephAnsibleSkipClient:
|
||||
description: |
|
||||
This boolean (when true) prevents the ceph-ansible client role execution
|
||||
by adding the ceph-ansible tag 'ceph_client' to the --skip-tags list.
|
||||
type: boolean
|
||||
default: true
|
||||
CephDynamicSpec:
|
||||
type: boolean
|
||||
default: true
|
||||
@ -428,20 +350,7 @@ parameters:
|
||||
parameter_groups:
|
||||
- label: deprecated
|
||||
description: Do not use deprecated params, they will be removed.
|
||||
parameters:
|
||||
- LocalCephAnsibleFetchDirectoryBackup
|
||||
- SwiftFetchDirGetTempurl
|
||||
- SwiftFetchDirPutTempurl
|
||||
- CephIPv6
|
||||
- CephAnsibleEnvironmentVariables
|
||||
- CephAnsibleExtraConfig
|
||||
- CephAnsiblePlaybook
|
||||
- CephAnsiblePlaybookVerbosity
|
||||
- CephAnsibleRepo
|
||||
- CephAnsibleSkipTags
|
||||
- CephAnsibleSkipClient
|
||||
- CephAnsibleWarning
|
||||
- CephOsdPercentageMin
|
||||
parameters: []
|
||||
|
||||
conditions:
|
||||
custom_registry_host:
|
||||
|
Loading…
Reference in New Issue
Block a user