Merge "Make various password descriptions consistent"
This commit is contained in:
commit
37099cce3d
|
@ -46,7 +46,7 @@ parameters:
|
||||||
The filepath of the certificate as it will be stored in the controller.
|
The filepath of the certificate as it will be stored in the controller.
|
||||||
type: string
|
type: string
|
||||||
RedisPassword:
|
RedisPassword:
|
||||||
description: The password for Redis
|
description: The password for the redis service account.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
MonitoringSubscriptionHaproxy:
|
MonitoringSubscriptionHaproxy:
|
||||||
|
|
|
@ -32,7 +32,7 @@ parameters:
|
||||||
default: 'regionOne'
|
default: 'regionOne'
|
||||||
description: Keystone region for endpoint
|
description: Keystone region for endpoint
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova service and db account, used by nova-api.
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
|
|
||||||
|
|
|
@ -40,7 +40,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
SwiftPassword:
|
SwiftPassword:
|
||||||
description: The password for the swift service account, used by the Ceph RGW services.
|
description: The password for the swift service account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
KeystoneRegion:
|
KeystoneRegion:
|
||||||
|
|
|
@ -51,7 +51,7 @@ parameters:
|
||||||
description: Whether to use Galera instead of regular MariaDB.
|
description: Whether to use Galera instead of regular MariaDB.
|
||||||
type: boolean
|
type: boolean
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova db account
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
EnableInternalTLS:
|
EnableInternalTLS:
|
||||||
|
|
|
@ -5,7 +5,7 @@ description: >
|
||||||
|
|
||||||
parameters:
|
parameters:
|
||||||
RedisPassword:
|
RedisPassword:
|
||||||
description: The password for Redis
|
description: The password for the redis service account.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
RedisFDLimit:
|
RedisFDLimit:
|
||||||
|
|
|
@ -44,7 +44,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: 'service'
|
default: 'service'
|
||||||
SwiftPassword:
|
SwiftPassword:
|
||||||
description: The password for the swift service account, used by the swift proxy services.
|
description: The password for the swift service account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
KeystoneRegion:
|
KeystoneRegion:
|
||||||
|
|
|
@ -51,7 +51,7 @@ parameters:
|
||||||
description: Whether or not to enable the HAProxy stats interface.
|
description: Whether or not to enable the HAProxy stats interface.
|
||||||
type: boolean
|
type: boolean
|
||||||
RedisPassword:
|
RedisPassword:
|
||||||
description: The password for Redis
|
description: The password for the redis service account.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
MonitoringSubscriptionHaproxy:
|
MonitoringSubscriptionHaproxy:
|
||||||
|
|
|
@ -32,7 +32,7 @@ parameters:
|
||||||
type: json
|
type: json
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
type: string
|
type: string
|
||||||
description: The password for the nova service and db account, used by nova-api.
|
description: The password for the nova service and db account
|
||||||
hidden: true
|
hidden: true
|
||||||
NeutronPassword:
|
NeutronPassword:
|
||||||
description: The password for the neutron service and db account, used by neutron agents.
|
description: The password for the neutron service and db account, used by neutron agents.
|
||||||
|
|
|
@ -31,8 +31,9 @@ parameters:
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
AdminPassword:
|
AdminPassword:
|
||||||
description: Keystone admin user password
|
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
|
||||||
type: string
|
type: string
|
||||||
|
hidden: true
|
||||||
KeystoneRegion:
|
KeystoneRegion:
|
||||||
default: 'regionOne'
|
default: 'regionOne'
|
||||||
description: Keystone region for endpoint
|
description: Keystone region for endpoint
|
||||||
|
|
|
@ -39,7 +39,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: 'no-auth'
|
default: 'no-auth'
|
||||||
AdminPassword:
|
AdminPassword:
|
||||||
description: Keystone admin user password
|
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
AdminTenantName:
|
AdminTenantName:
|
||||||
|
@ -47,7 +47,7 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
default: 'admin'
|
default: 'admin'
|
||||||
AdminToken:
|
AdminToken:
|
||||||
description: Keystone admin token
|
description: The keystone auth secret and db password.
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
AdminUser:
|
AdminUser:
|
||||||
|
|
|
@ -50,7 +50,7 @@ parameters:
|
||||||
description: Allow automatic l3-agent failover
|
description: Allow automatic l3-agent failover
|
||||||
type: string
|
type: string
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova service and db account, used by nova-api.
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
NeutronEnableDVR:
|
NeutronEnableDVR:
|
||||||
|
|
|
@ -31,7 +31,7 @@ parameters:
|
||||||
via parameter_defaults in the resource registry.
|
via parameter_defaults in the resource registry.
|
||||||
type: json
|
type: json
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova service account, used by nova-api.
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
NuageMetadataPort:
|
NuageMetadataPort:
|
||||||
|
|
|
@ -35,7 +35,7 @@ parameters:
|
||||||
description: Number of workers for Nova services.
|
description: Number of workers for Nova services.
|
||||||
type: number
|
type: number
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova service and db account, used by nova-api.
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
KeystoneRegion:
|
KeystoneRegion:
|
||||||
|
|
|
@ -41,7 +41,7 @@ parameters:
|
||||||
constraints:
|
constraints:
|
||||||
- allowed_values: [ 'messagingv2', 'noop' ]
|
- allowed_values: [ 'messagingv2', 'noop' ]
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova service and db account, used by nova-api.
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
NeutronPassword:
|
NeutronPassword:
|
||||||
|
|
|
@ -35,7 +35,7 @@ parameters:
|
||||||
description: Number of workers for Nova services.
|
description: Number of workers for Nova services.
|
||||||
type: number
|
type: number
|
||||||
NovaPassword:
|
NovaPassword:
|
||||||
description: The password for the nova service and db account, used by nova-placement.
|
description: The password for the nova service and db account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
KeystoneRegion:
|
KeystoneRegion:
|
||||||
|
|
|
@ -35,7 +35,7 @@ parameters:
|
||||||
description: Set to True to enable debugging on all services.
|
description: Set to True to enable debugging on all services.
|
||||||
type: string
|
type: string
|
||||||
SwiftPassword:
|
SwiftPassword:
|
||||||
description: The password for the swift service account, used by the swift proxy services.
|
description: The password for the swift service account
|
||||||
type: string
|
type: string
|
||||||
hidden: true
|
hidden: true
|
||||||
SwiftProxyNodeTimeout:
|
SwiftProxyNodeTimeout:
|
||||||
|
|
|
@ -62,7 +62,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
|
||||||
'NeutronMetadataProxySharedSecret': [
|
'NeutronMetadataProxySharedSecret': [
|
||||||
'description', 'hidden'],
|
'description', 'hidden'],
|
||||||
'ServiceNetMap': ['description', 'default'],
|
'ServiceNetMap': ['description', 'default'],
|
||||||
'RedisPassword': ['description'],
|
|
||||||
'EC2MetadataIp': ['default'],
|
'EC2MetadataIp': ['default'],
|
||||||
'network': ['default'],
|
'network': ['default'],
|
||||||
'ControlPlaneIP': ['default',
|
'ControlPlaneIP': ['default',
|
||||||
|
@ -74,7 +73,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
|
||||||
'NeutronWorkers': ['description'],
|
'NeutronWorkers': ['description'],
|
||||||
'TenantIpSubnet': ['description'],
|
'TenantIpSubnet': ['description'],
|
||||||
'ExternalNetName': ['description'],
|
'ExternalNetName': ['description'],
|
||||||
'AdminToken': ['description'],
|
|
||||||
'ControlPlaneDefaultRoute': ['default'],
|
'ControlPlaneDefaultRoute': ['default'],
|
||||||
'StorageMgmtNetName': ['description'],
|
'StorageMgmtNetName': ['description'],
|
||||||
'ServerMetadata': ['description'],
|
'ServerMetadata': ['description'],
|
||||||
|
@ -108,16 +106,13 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
|
||||||
'HostCpusList': ['default', 'constraints'],
|
'HostCpusList': ['default', 'constraints'],
|
||||||
'InternalApiAllocationPools': ['default'],
|
'InternalApiAllocationPools': ['default'],
|
||||||
'NodeIndex': ['description'],
|
'NodeIndex': ['description'],
|
||||||
'SwiftPassword': ['description'],
|
|
||||||
'name': ['description', 'default'],
|
'name': ['description', 'default'],
|
||||||
'StorageNetName': ['description'],
|
'StorageNetName': ['description'],
|
||||||
'ManagementNetName': ['description'],
|
'ManagementNetName': ['description'],
|
||||||
'NeutronPublicInterface': ['description'],
|
'NeutronPublicInterface': ['description'],
|
||||||
'RoleParameters': ['description'],
|
'RoleParameters': ['description'],
|
||||||
'AdminPassword': ['description', 'hidden'],
|
|
||||||
'ManagementInterfaceDefaultRoute':
|
'ManagementInterfaceDefaultRoute':
|
||||||
['default'],
|
['default'],
|
||||||
'NovaPassword': ['description'],
|
|
||||||
'image': ['description', 'default'],
|
'image': ['description', 'default'],
|
||||||
'NeutronBigswitchAgentEnabled': ['default'],
|
'NeutronBigswitchAgentEnabled': ['default'],
|
||||||
'EndpointMap': ['description', 'default'],
|
'EndpointMap': ['description', 'default'],
|
||||||
|
|
Loading…
Reference in New Issue