openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Reuse the various service passwords as db passwords."

This commit is contained in:
Jenkins 2015-05-27 09:38:45 +00:00 committed by Gerrit Code Review
parent 2c73a7b6ac 1db5013abd
commit 42e7689e6f
5 changed files with 66 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cinder-storage.yaml
View File

@ -16,6 +16,11 @@ parameters:
default: 5000
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
VirtualIP:
default: ''
type: string
@ -146,7 +151,7 @@ resources:
config: {get_resource: BlockStorageConfig}
input_values:
controller_virtual_ip: {get_param: VirtualIP}
cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: VirtualIP} , '/cinder']]}
cinder_dsn: {list_join: ['', ['mysql://cinder:', {get_param: CinderPassword}, '@', {get_param: VirtualIP} , '/cinder']]}
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
signal_transport: NO_SIGNAL

42
controller.yaml
View File

@ -11,7 +11,7 @@ parameters:
hidden: true
AdminToken:
default: unset
description: The keystone auth secret.
description: The keystone auth secret and db password.
type: string
hidden: true
CeilometerBackend:
@ -25,7 +25,7 @@ parameters:
hidden: true
CeilometerPassword:
default: unset
description: The password for the ceilometer service account.
description: The password for the ceilometer service and db account.
type: string
hidden: true
CinderEnableIscsiBackend:
@ -46,7 +46,7 @@ parameters:
type: number
CinderPassword:
default: unset
description: The password for the cinder service account, used by cinder-api.
description: The password for the cinder service and db account, used by cinder-api.
type: string
hidden: true
CloudName:
@ -137,7 +137,7 @@ parameters:
default: ''
GlancePassword:
default: unset
description: The password for the glance service account, used by the glance services.
description: The password for the glance service and db account, used by the glance services.
type: string
hidden: true
GlancePort:
@ -157,7 +157,7 @@ parameters:
- allowed_values: ['swift', 'file', 'rbd']
HeatPassword:
default: unset
description: The password for the Heat service account, used by the Heat services.
description: The password for the Heat service and db account, used by the Heat services.
type: string
hidden: true
HeatStackDomainAdminPassword:
@ -286,7 +286,7 @@ parameters:
type: string
NeutronPassword:
default: unset
description: The password for the neutron service account, used by neutron agents.
description: The password for the neutron service and db account, used by neutron agents.
type: string
hidden: true
NeutronPublicInterface:
@ -323,7 +323,7 @@ parameters:
type: string
NovaPassword:
default: unset
description: The password for the nova service account, used by nova-api.
description: The password for the nova service and db account, used by nova-api.
type: string
hidden: true
NtpServer:
@ -754,7 +754,9 @@ resources:
cinder_dsn:
list_join:
- ''
- - 'mysql://cinder:unset@'
- - 'mysql://cinder:'
- {get_param: CinderPassword}
- '@'
- {get_param: VirtualIP}
- '/cinder'
glance_port: {get_param: GlancePort}
@ -765,7 +767,9 @@ resources:
glance_dsn:
list_join:
- ''
- - 'mysql://glance:unset@'
- - 'mysql://glance:'
- {get_param: GlancePassword}
- '@'
- {get_param: VirtualIP}
- '/glance'
heat_password: {get_param: HeatPassword}
@ -774,7 +778,9 @@ resources:
heat_dsn:
list_join:
- ''
- - 'mysql://heat:unset@'
- - 'mysql://heat:'
- {get_param: HeatPassword}
- '@'
- {get_param: VirtualIP}
- '/heat'
keystone_ca_certificate: {get_param: KeystoneCACertificate}
@ -785,7 +791,9 @@ resources:
keystone_dsn:
list_join:
- ''
- - 'mysql://keystone:unset@'
- - 'mysql://keystone:'
- {get_param: AdminToken}
- '@'
- {get_param: VirtualIP}
- '/keystone'
mysql_innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
@ -815,7 +823,9 @@ resources:
neutron_dsn:
list_join:
- ''
- - 'mysql://neutron:unset@'
- - 'mysql://neutron:'
- {get_param: NeutronPassword}
- '@'
- {get_param: VirtualIP}
- '/ovs_neutron?charset=utf8'
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
@ -823,7 +833,9 @@ resources:
ceilometer_dsn:
list_join:
- ''
- - 'mysql://ceilometer:unset@'
- - 'mysql://ceilometer:'
- {get_param: CeilometerPassword}
- '@'
- {get_param: VirtualIP}
- '/ceilometer'
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
@ -832,7 +844,9 @@ resources:
nova_dsn:
list_join:
- ''
- - 'mysql://nova:unset@'
- - 'mysql://nova:'
- {get_param: NovaPassword}
- '@'
- {get_param: VirtualIP}
- '/nova'
rabbit_username: {get_param: RabbitUserName}

1
overcloud-without-mergepy.yaml
View File

@ -709,6 +709,7 @@ resources:
CinderLVMLoopDeviceSize: {get_param: CinderLVMLoopDeviceSize}
# Purpose of the dedicated BlockStorage nodes should be to use their local LVM
CinderEnableIscsiBackend: {get_param: CinderEnableIscsiBackend}
CinderPassword: {get_param: CinderPassword}
VirtualIP: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
KeyName: {get_param: KeyName}
Flavor: {get_param: OvercloudBlockStorageFlavor}

7
puppet/cinder-storage-puppet.yaml
View File

@ -16,6 +16,11 @@ parameters:
default: 5000
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
Debug:
default: ''
description: Set to True to enable debugging on all services.
@ -158,7 +163,7 @@ resources:
config: {get_resource: BlockStorageConfig}
input_values:
debug: {get_param: Debug}
cinder_dsn: {list_join: ['', ['mysql://cinder:unset@', {get_param: VirtualIP} , '/cinder']]}
cinder_dsn: {list_join: ['', ['mysql://cinder:', {get_param: CinderPassword}, '@', {get_param: VirtualIP} , '/cinder']]}
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
cinder_lvm_loop_device_size:

38
puppet/controller-puppet.yaml
View File

@ -11,7 +11,7 @@ parameters:
hidden: true
AdminToken:
default: unset
description: The keystone auth secret.
description: The keystone auth secret and db password.
type: string
hidden: true
CeilometerBackend:
@ -25,7 +25,7 @@ parameters:
hidden: true
CeilometerPassword:
default: unset
description: The password for the ceilometer service account.
description: The password for the ceilometer service and db account.
type: string
hidden: true
CinderEnableIscsiBackend:
@ -46,7 +46,7 @@ parameters:
type: number
CinderPassword:
default: unset
description: The password for the cinder service account, used by cinder-api.
description: The password for the cinder service and db account, used by cinder-api.
type: string
hidden: true
CloudName:
@ -137,7 +137,7 @@ parameters:
default: ''
GlancePassword:
default: unset
description: The password for the glance service account, used by the glance services.
description: The password for the glance service and db account, used by the glance services.
type: string
hidden: true
GlancePort:
@ -157,7 +157,7 @@ parameters:
- allowed_values: ['swift', 'file', 'rbd']
HeatPassword:
default: unset
description: The password for the Heat service account, used by the Heat services.
description: The password for the Heat service and db account, used by the Heat services.
type: string
hidden: true
HeatStackDomainAdminPassword:
@ -290,7 +290,7 @@ parameters:
type: string
NeutronPassword:
default: unset
description: The password for the neutron service account, used by neutron agents.
description: The password for the neutron service and db account, used by neutron agents.
type: string
hidden: true
NeutronPublicInterface:
@ -327,7 +327,7 @@ parameters:
type: string
NovaPassword:
default: unset
description: The password for the nova service account, used by nova-api.
description: The password for the nova service and db account, used by nova-api.
type: string
hidden: true
NtpServer:
@ -545,7 +545,9 @@ resources:
cinder_dsn:
list_join:
- ''
- - 'mysql://cinder:unset@'
- - 'mysql://cinder:'
- {get_param: CinderPassword}
- '@'
- {get_param: VirtualIP}
- '/cinder'
glance_port: {get_param: GlancePort}
@ -558,7 +560,9 @@ resources:
glance_dsn:
list_join:
- ''
- - 'mysql://glance:unset@'
- - 'mysql://glance:'
- {get_param: GlancePassword}
- '@'
- {get_param: VirtualIP}
- '/glance'
heat_password: {get_param: HeatPassword}
@ -566,7 +570,9 @@ resources:
heat_dsn:
list_join:
- ''
- - 'mysql://heat:unset@'
- - 'mysql://heat:'
- {get_param: HeatPassword}
- '@'
- {get_param: VirtualIP}
- '/heat'
keystone_ca_certificate: {get_param: KeystoneCACertificate}
@ -577,7 +583,9 @@ resources:
keystone_dsn:
list_join:
- ''
- - 'mysql://keystone:unset@'
- - 'mysql://keystone:'
- {get_param: AdminToken}
- '@'
- {get_param: VirtualIP}
- '/keystone'
keystone_identity_uri:
@ -622,7 +630,9 @@ resources:
neutron_dsn:
list_join:
- ''
- - 'mysql://neutron:unset@'
- - 'mysql://neutron:'
- {get_param: NeutronPassword}
- '@'
- {get_param: VirtualIP}
- '/ovs_neutron?charset=utf8'
neutron_url:
@ -652,7 +662,9 @@ resources:
nova_dsn:
list_join:
- ''
- - 'mysql://nova:unset@'
- - 'mysql://nova:'
- {get_param: NovaPassword}
- '@'
- {get_param: VirtualIP}
- '/nova'
pcsd_password: {get_param: PcsdPassword}