Browse Source

Merge "Check Ceph*Key value format and halt on error" into stable/queens

changes/42/714942/1
Zuul 3 months ago
committed by Gerrit Code Review
parent
commit
21435a76c3
10 changed files with 32 additions and 0 deletions
  1. +6
    -0
      docker/services/ceph-ansible/ceph-base.yaml
  2. +4
    -0
      docker/services/ceph-ansible/ceph-mon.yaml
  3. +2
    -0
      docker/services/nova-libvirt.yaml
  4. +6
    -0
      puppet/services/ceph-base.yaml
  5. +4
    -0
      puppet/services/ceph-external.yaml
  6. +2
    -0
      puppet/services/ceph-mon.yaml
  7. +2
    -0
      puppet/services/ceph-rgw.yaml
  8. +2
    -0
      puppet/services/manila-backend-cephfs.yaml
  9. +2
    -0
      puppet/services/nova-compute.yaml
  10. +2
    -0
      puppet/services/nova-libvirt.yaml

+ 6
- 0
docker/services/ceph-ansible/ceph-base.yaml View File

@@ -119,6 +119,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClientUserName:
default: openstack
type: string
@@ -130,6 +132,8 @@ parameters:
with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephPoolDefaultSize:
description: default minimum replication for RBD copies
type: number
@@ -157,6 +161,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephIPv6:
default: False
type: boolean


+ 4
- 0
docker/services/ceph-ansible/ceph-mon.yaml View File

@@ -34,11 +34,15 @@ parameters:
description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephAdminKey:
default: ''
description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephValidationRetries:
type: number
default: 40


+ 2
- 0
docker/services/nova-libvirt.yaml View File

@@ -70,6 +70,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClusterFSID:
type: string
description: The Ceph cluster FSID. Must be a UUID.


+ 6
- 0
puppet/services/ceph-base.yaml View File

@@ -10,10 +10,14 @@ parameters:
description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClientKey:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClientUserName:
default: openstack
type: string
@@ -80,6 +84,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
# DEPRECATED options for compatibility with overcloud.yaml
# This should be removed and manipulation of the ControllerServices list
# used instead, but we need client support for that first


+ 4
- 0
puppet/services/ceph-external.yaml View File

@@ -8,6 +8,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClientUserName:
default: openstack
type: string
@@ -79,6 +81,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"

outputs:
role_data:


+ 2
- 0
puppet/services/ceph-mon.yaml View File

@@ -37,6 +37,8 @@ parameters:
description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CinderRbdPoolName:
default: volumes
type: string


+ 2
- 0
puppet/services/ceph-rgw.yaml View File

@@ -39,6 +39,8 @@ parameters:
with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
SwiftPassword:
description: The password for the swift service account
type: string


+ 2
- 0
puppet/services/manila-backend-cephfs.yaml View File

@@ -76,6 +76,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"

outputs:
role_data:


+ 2
- 0
puppet/services/nova-compute.yaml View File

@@ -52,6 +52,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClusterFSID:
type: string
description: The Ceph cluster FSID. Must be a UUID.


+ 2
- 0
puppet/services/nova-libvirt.yaml View File

@@ -46,6 +46,8 @@ parameters:
description: The Ceph client key. Can be created with ceph-authtool --gen-print-key.
type: string
hidden: true
constraints:
- allowed_pattern: "^[a-zA-Z0-9+/]{38}==$"
CephClusterFSID:
type: string
description: The Ceph cluster FSID. Must be a UUID.


Loading…
Cancel
Save