Merge "Let mds create manila key and fs"
This commit is contained in:
commit
6fafefd35e
@ -94,7 +94,7 @@ parameters:
|
|||||||
default: vms
|
default: vms
|
||||||
type: string
|
type: string
|
||||||
CephClientKey:
|
CephClientKey:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClientUserName:
|
CephClientUserName:
|
||||||
|
@ -61,7 +61,7 @@ parameters:
|
|||||||
description: Whether to enable or not the Rbd backend for Cinder
|
description: Whether to enable or not the Rbd backend for Cinder
|
||||||
type: boolean
|
type: boolean
|
||||||
CephClientKey:
|
CephClientKey:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClusterFSID:
|
CephClusterFSID:
|
||||||
|
@ -13,7 +13,7 @@ parameter_defaults:
|
|||||||
# Type: string
|
# Type: string
|
||||||
CephAdminKey: ''
|
CephAdminKey: ''
|
||||||
|
|
||||||
# The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
# The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
# Mandatory. This parameter must be set by the user.
|
# Mandatory. This parameter must be set by the user.
|
||||||
# Type: string
|
# Type: string
|
||||||
CephClientKey: <None>
|
CephClientKey: <None>
|
||||||
|
@ -11,7 +11,7 @@ parameters:
|
|||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClientKey:
|
CephClientKey:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClientUserName:
|
CephClientUserName:
|
||||||
@ -61,6 +61,14 @@ parameters:
|
|||||||
description: Mapping of service endpoint -> protocol. Typically set
|
description: Mapping of service endpoint -> protocol. Typically set
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
|
ManilaCephFSNativeCephFSAuthId:
|
||||||
|
type: string
|
||||||
|
default: 'manila'
|
||||||
|
CephManilaClientKey:
|
||||||
|
default: ''
|
||||||
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
|
type: string
|
||||||
|
hidden: true
|
||||||
# DEPRECATED options for compatibility with overcloud.yaml
|
# DEPRECATED options for compatibility with overcloud.yaml
|
||||||
# This should be removed and manipulation of the ControllerServices list
|
# This should be removed and manipulation of the ControllerServices list
|
||||||
# used instead, but we need client support for that first
|
# used instead, but we need client support for that first
|
||||||
@ -133,6 +141,14 @@ outputs:
|
|||||||
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
|
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
|
||||||
GLANCE_POOL: {get_param: GlanceRbdPoolName}
|
GLANCE_POOL: {get_param: GlanceRbdPoolName}
|
||||||
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
|
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
|
||||||
|
MANILA_CLIENT_KEY:
|
||||||
|
mode: '0644'
|
||||||
|
secret: {get_param: CephManilaClientKey}
|
||||||
|
cap_mon: 'allow r, allow command \"auth del\", allow command \"auth caps\", allow command \"auth get\", allow command \"auth get-or-create\"'
|
||||||
|
cap_mds: 'allow *'
|
||||||
|
cap_osd: 'allow rw'
|
||||||
- keys:
|
- keys:
|
||||||
CEPH_CLIENT_KEY:
|
CEPH_CLIENT_KEY:
|
||||||
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
||||||
|
MANILA_CLIENT_KEY:
|
||||||
|
list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]]
|
||||||
|
@ -5,7 +5,7 @@ description: >
|
|||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
CephClientKey:
|
CephClientKey:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClientUserName:
|
CephClientUserName:
|
||||||
@ -68,6 +68,14 @@ parameters:
|
|||||||
image. Only applies to format 2 images. Set to '1' for Jewel
|
image. Only applies to format 2 images. Set to '1' for Jewel
|
||||||
clients using older Ceph servers.
|
clients using older Ceph servers.
|
||||||
type: string
|
type: string
|
||||||
|
ManilaCephFSNativeCephFSAuthId:
|
||||||
|
type: string
|
||||||
|
default: 'manila'
|
||||||
|
CephManilaClientKey:
|
||||||
|
default: ''
|
||||||
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
|
type: string
|
||||||
|
hidden: true
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
@ -94,9 +102,17 @@ outputs:
|
|||||||
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
|
CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
|
||||||
GLANCE_POOL: {get_param: GlanceRbdPoolName}
|
GLANCE_POOL: {get_param: GlanceRbdPoolName}
|
||||||
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
|
GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
|
||||||
|
MANILA_CLIENT_KEY:
|
||||||
|
mode: '0644'
|
||||||
|
secret: {get_param: CephManilaClientKey}
|
||||||
|
cap_mon: 'allow r, allow command \"auth del\", allow command \"auth caps\", allow command \"auth get\", allow command \"auth get-or-create\"'
|
||||||
|
cap_mds: 'allow *'
|
||||||
|
cap_osd: 'allow rw'
|
||||||
- keys:
|
- keys:
|
||||||
CEPH_CLIENT_KEY:
|
CEPH_CLIENT_KEY:
|
||||||
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
list_join: ['.', ['client', {get_param: CephClientUserName}]]
|
||||||
|
MANILA_CLIENT_KEY:
|
||||||
|
list_join: ['.', ['client', {get_param: ManilaCephFSNativeCephFSAuthId}]]
|
||||||
ceph::profile::params::manage_repo: false
|
ceph::profile::params::manage_repo: false
|
||||||
# FIXME(gfidente): we should not have to list the packages explicitly in
|
# FIXME(gfidente): we should not have to list the packages explicitly in
|
||||||
# the templates, but this should stay until the following is fixed:
|
# the templates, but this should stay until the following is fixed:
|
||||||
|
@ -35,6 +35,15 @@ parameters:
|
|||||||
with ceph-authtool --gen-print-key.
|
with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
ManilaCephFSDataPoolName:
|
||||||
|
default: manila_data
|
||||||
|
type: string
|
||||||
|
ManilaCephFSMetadataPoolName:
|
||||||
|
default: manila_metadata
|
||||||
|
type: string
|
||||||
|
ManilaCephFSNativeShareBackendName:
|
||||||
|
default: cephfs
|
||||||
|
type: string
|
||||||
|
|
||||||
resources:
|
resources:
|
||||||
CephBase:
|
CephBase:
|
||||||
@ -60,5 +69,8 @@ outputs:
|
|||||||
'112 ceph_mds':
|
'112 ceph_mds':
|
||||||
dport:
|
dport:
|
||||||
- '6800-7300'
|
- '6800-7300'
|
||||||
|
ceph::profile::params::fs_data_pool: {get_param: ManilaCephFSDataPoolName}
|
||||||
|
ceph::profile::params::fs_metadata_pool: {get_param: ManilaCephFSMetadataPoolName}
|
||||||
|
ceph::profile::params::fs_name: {get_param: ManilaCephFSNativeShareBackendName}
|
||||||
step_config: |
|
step_config: |
|
||||||
include ::tripleo::profile::base::ceph::mds
|
include ::tripleo::profile::base::ceph::mds
|
||||||
|
@ -52,12 +52,6 @@ parameters:
|
|||||||
ManilaCephFSNativeCephFSEnableSnapshots:
|
ManilaCephFSNativeCephFSEnableSnapshots:
|
||||||
type: boolean
|
type: boolean
|
||||||
default: false
|
default: false
|
||||||
ManilaCephFSDataPoolName:
|
|
||||||
default: manila_data
|
|
||||||
type: string
|
|
||||||
ManilaCephFSMetadataPoolName:
|
|
||||||
default: manila_metadata
|
|
||||||
type: string
|
|
||||||
# (jprovazn) default value is set to assure this templates works with an
|
# (jprovazn) default value is set to assure this templates works with an
|
||||||
# external ceph too (user/key is created only when ceph is deployed by
|
# external ceph too (user/key is created only when ceph is deployed by
|
||||||
# TripleO)
|
# TripleO)
|
||||||
@ -81,7 +75,4 @@ outputs:
|
|||||||
manila::backend::cephfsnative::cephfs_cluster_name: {get_param: ManilaCephFSNativeCephFSClusterName}
|
manila::backend::cephfsnative::cephfs_cluster_name: {get_param: ManilaCephFSNativeCephFSClusterName}
|
||||||
manila::backend::cephfsnative::cephfs_enable_snapshots: {get_param: ManilaCephFSNativeCephFSEnableSnapshots}
|
manila::backend::cephfsnative::cephfs_enable_snapshots: {get_param: ManilaCephFSNativeCephFSEnableSnapshots}
|
||||||
manila::backend::cephfsnative::ceph_client_key: {get_param: CephManilaClientKey}
|
manila::backend::cephfsnative::ceph_client_key: {get_param: CephManilaClientKey}
|
||||||
ceph::profile::params::fs_data_pool: {get_param: ManilaCephFSDataPoolName}
|
|
||||||
ceph::profile::params::fs_metadata_pool: {get_param: ManilaCephFSMetadataPoolName}
|
|
||||||
ceph::profile::params::fs_name: {get_param: ManilaCephFSNativeShareBackendName}
|
|
||||||
step_config:
|
step_config:
|
||||||
|
@ -37,7 +37,7 @@ parameters:
|
|||||||
default: openstack
|
default: openstack
|
||||||
type: string
|
type: string
|
||||||
CephClientKey:
|
CephClientKey:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClusterFSID:
|
CephClusterFSID:
|
||||||
|
@ -34,7 +34,7 @@ parameters:
|
|||||||
default: openstack
|
default: openstack
|
||||||
type: string
|
type: string
|
||||||
CephClientKey:
|
CephClientKey:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
CephClusterFSID:
|
CephClusterFSID:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user