Check Ceph*Key value format and halt on error
The CephX keys secret is expected to have a specific format, this adds a constraint in the templates to ensure it has the correct format. Change-Id: Ic12c3c287a921d696de1395bc887691c48146359 Closes-Bug: 1864185 (cherry picked from commit0940dfd95e
) (cherry picked from commit33ce60d6ac
) (cherry picked from commit98652da2ab
)
This commit is contained in:
parent
4f639c693c
commit
909d57ccc1
|
@ -120,6 +120,8 @@ parameters:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephClientUserName:
|
CephClientUserName:
|
||||||
default: openstack
|
default: openstack
|
||||||
type: string
|
type: string
|
||||||
|
@ -131,6 +133,8 @@ parameters:
|
||||||
with ceph-authtool --gen-print-key.
|
with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephPoolDefaultSize:
|
CephPoolDefaultSize:
|
||||||
description: default minimum replication for RBD copies
|
description: default minimum replication for RBD copies
|
||||||
type: number
|
type: number
|
||||||
|
@ -158,6 +162,8 @@ parameters:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephIPv6:
|
CephIPv6:
|
||||||
default: False
|
default: False
|
||||||
type: boolean
|
type: boolean
|
||||||
|
|
|
@ -34,11 +34,15 @@ parameters:
|
||||||
description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephAdminKey:
|
CephAdminKey:
|
||||||
default: ''
|
default: ''
|
||||||
description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephValidationRetries:
|
CephValidationRetries:
|
||||||
type: number
|
type: number
|
||||||
default: 40
|
default: 40
|
||||||
|
|
|
@ -70,6 +70,8 @@ parameters:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephClusterFSID:
|
CephClusterFSID:
|
||||||
type: string
|
type: string
|
||||||
description: The Ceph cluster FSID. Must be a UUID.
|
description: The Ceph cluster FSID. Must be a UUID.
|
||||||
|
|
|
@ -76,6 +76,8 @@ parameters:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
|
|
||||||
outputs:
|
outputs:
|
||||||
role_data:
|
role_data:
|
||||||
|
|
|
@ -52,6 +52,8 @@ parameters:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephClusterFSID:
|
CephClusterFSID:
|
||||||
type: string
|
type: string
|
||||||
description: The Ceph cluster FSID. Must be a UUID.
|
description: The Ceph cluster FSID. Must be a UUID.
|
||||||
|
|
|
@ -46,6 +46,8 @@ parameters:
|
||||||
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
constraints:
|
||||||
|
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
|
||||||
CephClusterFSID:
|
CephClusterFSID:
|
||||||
type: string
|
type: string
|
||||||
description: The Ceph cluster FSID. Must be a UUID.
|
description: The Ceph cluster FSID. Must be a UUID.
|
||||||
|
|
Loading…
Reference in New Issue