openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Make various password descriptions consistent"

Browse Source
This commit is contained in:
Jenkins 2017-07-26 13:13:56 +00:00 committed by Gerrit Code Review
commit 37099cce3d
17 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docker/services/haproxy.yaml
View File

@ -46,7 +46,7 @@ parameters:
The filepath of the certificate as it will be stored in the controller.
type: string
RedisPassword:
description: The password for Redis
description: The password for the redis service account.
type: string
hidden: true
MonitoringSubscriptionHaproxy:

2
puppet/major_upgrade_steps.j2.yaml
View File

@ -32,7 +32,7 @@ parameters:
default: 'regionOne'
description: Keystone region for endpoint
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
hidden: true

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

@ -40,7 +40,7 @@ parameters:
type: string
hidden: true
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
hidden: true
KeystoneRegion:

2
puppet/services/database/mysql.yaml
View File

@ -51,7 +51,7 @@ parameters:
description: Whether to use Galera instead of regular MariaDB.
type: boolean
NovaPassword:
description: The password for the nova db account
description: The password for the nova service and db account
type: string
hidden: true
EnableInternalTLS:

2
puppet/services/database/redis-base.yaml
View File

@ -5,7 +5,7 @@ description: >
parameters:
RedisPassword:
description: The password for Redis
description: The password for the redis service account.
type: string
hidden: true
RedisFDLimit:

2
puppet/services/external-swift-proxy.yaml
View File

@ -44,7 +44,7 @@ parameters:
type: string
default: 'service'
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
hidden: true
KeystoneRegion:

2
puppet/services/haproxy.yaml
View File

@ -51,7 +51,7 @@ parameters:
description: Whether or not to enable the HAProxy stats interface.
type: boolean
RedisPassword:
description: The password for Redis
description: The password for the redis service account.
type: string
hidden: true
MonitoringSubscriptionHaproxy:

2
puppet/services/manila-scheduler.yaml
View File

@ -32,7 +32,7 @@ parameters:
type: json
NovaPassword:
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
NeutronPassword:
description: The password for the neutron service and db account, used by neutron agents.

3
puppet/services/monitoring/sensu-client.yaml
View File

@ -31,8 +31,9 @@ parameters:
via parameter_defaults in the resource registry.
type: json
AdminPassword:
description: Keystone admin user password
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
hidden: true
KeystoneRegion:
default: 'regionOne'
description: Keystone region for endpoint

4
puppet/services/network/contrail-base.yaml
View File

@ -39,7 +39,7 @@ parameters:
type: string
default: 'no-auth'
AdminPassword:
description: Keystone admin user password
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
hidden: true
AdminTenantName:
@ -47,7 +47,7 @@ parameters:
type: string
default: 'admin'
AdminToken:
description: Keystone admin token
description: The keystone auth secret and db password.
type: string
hidden: true
AdminUser:

2
puppet/services/neutron-api.yaml
View File

@ -50,7 +50,7 @@ parameters:
description: Allow automatic l3-agent failover
type: string
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
hidden: true
NeutronEnableDVR:

2
puppet/services/neutron-compute-plugin-nuage.yaml
View File

@ -31,7 +31,7 @@ parameters:
via parameter_defaults in the resource registry.
type: json
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
hidden: true
NuageMetadataPort:

2
puppet/services/nova-api.yaml
View File

@ -35,7 +35,7 @@ parameters:
description: Number of workers for Nova services.
type: number
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
hidden: true
KeystoneRegion:

2
puppet/services/nova-base.yaml
View File

@ -41,7 +41,7 @@ parameters:
constraints:
- allowed_values: [ 'messagingv2', 'noop' ]
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
hidden: true
NeutronPassword:

2
puppet/services/nova-placement.yaml
View File

@ -35,7 +35,7 @@ parameters:
description: Number of workers for Nova services.
type: number
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
hidden: true
KeystoneRegion:

2
puppet/services/swift-proxy.yaml
View File

@ -35,7 +35,7 @@ parameters:
description: Set to True to enable debugging on all services.
type: string
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
hidden: true
SwiftProxyNodeTimeout:

5
tools/yaml-validate.py
View File

@ -62,7 +62,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'NeutronMetadataProxySharedSecret': [
'description', 'hidden'],
'ServiceNetMap': ['description', 'default'],
'RedisPassword': ['description'],
'EC2MetadataIp': ['default'],
'network': ['default'],
'ControlPlaneIP': ['default',
@ -74,7 +73,6 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'NeutronWorkers': ['description'],
'TenantIpSubnet': ['description'],
'ExternalNetName': ['description'],
'AdminToken': ['description'],
'ControlPlaneDefaultRoute': ['default'],
'StorageMgmtNetName': ['description'],
'ServerMetadata': ['description'],
@ -108,16 +106,13 @@ PARAMETER_DEFINITION_EXCLUSIONS = {'ManagementNetCidr': ['default'],
'HostCpusList': ['default', 'constraints'],
'InternalApiAllocationPools': ['default'],
'NodeIndex': ['description'],
'SwiftPassword': ['description'],
'name': ['description', 'default'],
'StorageNetName': ['description'],
'ManagementNetName': ['description'],
'NeutronPublicInterface': ['description'],
'RoleParameters': ['description'],
'AdminPassword': ['description', 'hidden'],
'ManagementInterfaceDefaultRoute':
['default'],
'NovaPassword': ['description'],
'image': ['description', 'default'],
'NeutronBigswitchAgentEnabled': ['default'],
'EndpointMap': ['description', 'default'],