openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Remove unsafe "unset" defaults"

Browse Source
This commit is contained in:
Jenkins
2015-12-23 16:37:17 +00:00
committed by Gerrit Code Review
parent aca5be22c2 293f19b2a4
commit c40f2a3b67
5 changed files with 0 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
overcloud.yaml
View File

@@ -13,7 +13,6 @@ parameters:
# Common parameters (not specific to a role)
AdminPassword:
default: unset
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
hidden: true
@@ -22,12 +21,10 @@ parameters:
description: The ceilometer backend type.
type: string
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
type: string
hidden: true
CeilometerPassword:
default: unset
description: The password for the ceilometer service account.
type: string
hidden: true
@@ -138,7 +135,6 @@ parameters:
description: The tenant network type for Neutron.
type: comma_delimited_list
NeutronPassword:
default: unset
description: The password for the neutron service account, used by neutron agents.
type: string
hidden: true
@@ -169,7 +165,6 @@ parameters:
description: Whether to configure Neutron Distributed Virtual Routers
type: string
NeutronMetadataProxySharedSecret:
default: 'unset'
description: Shared secret to prevent spoofing
type: string
hidden: true
@@ -225,7 +220,6 @@ parameters:
default: 1
description: The number of neutron dhcp agents to schedule per network
NovaPassword:
default: unset
description: The password for the nova service account, used by nova-api.
type: string
hidden: true
@@ -277,7 +271,6 @@ parameters:
description: The user name for SNMPd with readonly rights running on all Overcloud nodes
type: string
SnmpdReadonlyUserPassword:
default: unset
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
@@ -296,7 +289,6 @@ parameters:
# Controller-specific params
AdminToken:
default: unset
description: The keystone auth secret.
type: string
hidden: true
@@ -317,7 +309,6 @@ parameters:
CinderEnableNfsBackend is true.
type: comma_delimited_list
CinderPassword:
default: unset
description: The password for the cinder service account, used by cinder-api.
type: string
hidden: true
@@ -418,7 +409,6 @@ parameters:
type: string
default: noop
GlancePassword:
default: unset
description: The password for the glance service account, used by the glance services.
type: string
hidden: true
@@ -430,14 +420,12 @@ parameters:
constraints:
- allowed_values: ['swift', 'file', 'rbd']
HeatPassword:
default: unset
description: The password for the Heat service account, used by the Heat services.
type: string
hidden: true
HeatStackDomainAdminPassword:
description: Password for heat_domain_admin user.
type: string
default: ''
hidden: true
InstanceNameTemplate:
default: 'instance-%08x'
@@ -517,12 +505,10 @@ parameters:
This should be int_public when a VLAN is being used.
type: string
SwiftHashSuffix:
default: unset
description: A random string to be used as a salt when hashing to determine mappings in the ring.
type: string
hidden: true
SwiftPassword:
default: unset
description: The password for the swift service account, used by the swift proxy services.
type: string
hidden: true

2
puppet/cinder-storage.yaml
View File

@@ -17,7 +17,6 @@ parameters:
description: The size of the loopback file used by the cinder LVM driver.
type: number
CinderPassword:
default: unset
description: The password for the cinder service and db account, used by cinder-api.
type: string
hidden: true
@@ -70,7 +69,6 @@ parameters:
description: The user name for SNMPd with readonly rights running on all Overcloud nodes
type: string
SnmpdReadonlyUserPassword:
default: unset
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true

7
puppet/compute.yaml
View File

@@ -5,7 +5,6 @@ description: >
parameters:
AdminPassword:
default: unset
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
hidden: true
@@ -16,12 +15,10 @@ parameters:
constraints:
- allowed_values: ['', Present]
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
type: string
hidden: true
CeilometerPassword:
default: unset
description: The password for the ceilometer service account.
type: string
hidden: true
@@ -110,7 +107,6 @@ parameters:
VLAN on the 'datacentre' physical network (See NeutronBridgeMappings).
type: comma_delimited_list
NeutronPassword:
default: unset
description: The password for the neutron service account, used by neutron agents.
type: string
hidden: true
@@ -146,7 +142,6 @@ parameters:
default: 'False'
type: string
NeutronMetadataProxySharedSecret:
default: 'unset'
description: Shared secret to prevent spoofing
type: string
hidden: true
@@ -210,7 +205,6 @@ parameters:
description: Whether to enable or not the Rbd backend for Nova
type: boolean
NovaPassword:
default: unset
description: The password for the nova service account, used by nova-api.
type: string
hidden: true
@@ -256,7 +250,6 @@ parameters:
description: The user name for SNMPd with readonly rights running on all Overcloud nodes
type: string
SnmpdReadonlyUserPassword:
default: unset
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true

14
puppet/controller.yaml
View File

@@ -10,12 +10,10 @@ parameters:
type: string
hidden: true
AdminPassword:
default: unset
description: The password for the keystone admin account, used for monitoring, querying neutron etc.
type: string
hidden: true
AdminToken:
default: unset
description: The keystone auth secret and db password.
type: string
hidden: true
@@ -27,12 +25,10 @@ parameters:
description: The ceilometer backend type.
type: string
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
type: string
hidden: true
CeilometerPassword:
default: unset
description: The password for the ceilometer service and db account.
type: string
hidden: true
@@ -76,7 +72,6 @@ parameters:
CinderEnableNfsBackend is true.
type: comma_delimited_list
CinderPassword:
default: unset
description: The password for the cinder service and db account, used by cinder-api.
type: string
hidden: true
@@ -187,7 +182,6 @@ parameters:
type: string
default: ''
GlancePassword:
default: unset
description: The password for the glance service and db account, used by the glance services.
type: string
hidden: true
@@ -231,14 +225,12 @@ parameters:
description: Number of workers for Glance service.
type: number
HeatPassword:
default: unset
description: The password for the Heat service and db account, used by the Heat services.
type: string
hidden: true
HeatStackDomainAdminPassword:
description: Password for heat_domain_admin user.
type: string
default: ''
hidden: true
HeatAuthEncryptionKey:
description: Auth encryption key for heat-engine
@@ -396,7 +388,6 @@ parameters:
description: Whether to configure Neutron Distributed Virtual Routers
type: string
NeutronMetadataProxySharedSecret:
default: 'unset'
description: Shared secret to prevent spoofing
type: string
hidden: true
@@ -458,7 +449,6 @@ parameters:
VLAN on the 'datacentre' physical network (See NeutronBridgeMappings).
type: comma_delimited_list
NeutronPassword:
default: unset
description: The password for the neutron service and db account, used by neutron agents.
type: string
hidden: true
@@ -513,7 +503,6 @@ parameters:
description: Number of workers for Neutron service.
type: number
NovaPassword:
default: unset
description: The password for the nova service and db account, used by nova-api.
type: string
hidden: true
@@ -577,12 +566,10 @@ parameters:
description: The user name for SNMPd with readonly rights running on all Overcloud nodes
type: string
SnmpdReadonlyUserPassword:
default: unset
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true
SwiftHashSuffix:
default: unset
description: A random string to be used as a salt when hashing to determine mappings
in the ring.
hidden: true
@@ -600,7 +587,6 @@ parameters:
description: Partition Power to use when building Swift rings
type: number
SwiftPassword:
default: unset
description: The password for the swift service account, used by the swift proxy
services.
hidden: true

2
puppet/swift-storage.yaml
View File

@@ -7,7 +7,6 @@ parameters:
constraints:
- custom_constraint: nova.flavor
HashSuffix:
default: unset
description: A random string to be used as a salt when hashing to determine mappings
in the ring.
hidden: true
@@ -40,7 +39,6 @@ parameters:
description: The user name for SNMPd with readonly rights running on all Overcloud nodes
type: string
SnmpdReadonlyUserPassword:
default: unset
description: The user password for SNMPd with readonly rights running on all Overcloud nodes
type: string
hidden: true