openstack/tripleo-heat-templates
Code Issues Proposed changes

Don't store Ceilo DB credentials on compute node

Browse Source 
This patch removes all references to the Ceilometer DSN parameter
in the overcloud compute templates. These credentials
are not required in order to run the required Ceilometer
service/agents.

Change-Id: I421ce4fca87ac87dd65ab8bbb20e7ea9be8d9c5d
This commit is contained in:
Dan Prince 2014-12-07 15:03:42 -05:00
parent 2c403d89fa
commit 84c7b32c41
6 changed files with 0 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compute-config.yaml
View File

@ -17,7 +17,6 @@ resources:
public_ip: {get_input: nova_public_ip}
service-password: {get_input: nova_password}
ceilometer:
db: {get_input: ceilometer_dsn}
debug: {get_input: debug}
metering_secret: {get_input: ceilometer_metering_secret}
service-password: {get_input: ceilometer_password}

3
compute.yaml
View File

@ -15,8 +15,6 @@ parameters:
default: ''
constraints:
- allowed_values: ['', Present]
CeilometerDSN:
type: string
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
@ -259,7 +257,6 @@ resources:
nova_public_ip: {get_param: NovaPublicIP}
nova_api_host: {get_param: NovaApiHost}
nova_password: {get_param: NovaPassword}
ceilometer_dsn: {get_param: CeilometerDSN}
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
ceilometer_password: {get_param: CeilometerPassword}
ceilometer_compute_agent: {get_param: CeilometerComputeAgent}

1
nova-compute-config.yaml
View File

@ -12,7 +12,6 @@ resources:
public_ip: {get_input: nova_public_ip}
service-password: {get_input: nova_password}
ceilometer:
db: {get_input: ceilometer_dsn}
debug: {get_param: Debug}
metering_secret: {get_input: ceilometer_metering_secret}
service-password: {get_input: ceilometer_password}

3
nova-compute-instance.yaml
View File

@ -15,8 +15,6 @@ parameters:
default: ''
constraints:
- allowed_values: ['', Present]
CeilometerDSN:
type: string
CeilometerMeteringSecret:
default: unset
description: Secret shared by the ceilometer services.
@ -209,7 +207,6 @@ resources:
nova_public_ip: {get_param: NovaPublicIP}
nova_api_host: {get_param: NovaApiHost}
nova_password: {get_param: NovaPassword}
ceilometer_dsn: {get_param: CeilometerDSN}
ceilometer_metering_secret: {get_param: CeilometerMeteringSecret}
ceilometer_password: {get_param: CeilometerPassword}
ceilometer_compute_agent: {get_param: CeilometerComputeAgent}

6
overcloud-source.yaml
View File

@ -421,12 +421,6 @@ resources:
GlanceHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
RabbitHost: {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
NovaPublicIP: {get_attr: [PublicVirtualIP, fixed_ips, 0, ip_address]}
CeilometerDSN:
Fn::Join:
- ''
- - mysql://ceilometer:unset@
- &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
- /ceilometer
NeutronNetworkType:
get_param: NeutronNetworkType
NeutronTunnelTypes:

6
overcloud-without-mergepy.yaml
View File

@ -577,12 +577,6 @@ resources:
RabbitUserName: {get_param: RabbitUserName}
SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
CeilometerDSN:
list_join:
- ''
- - mysql://ceilometer:unset@
- &compute_database_host {get_attr: [ControlVirtualIP, fixed_ips, 0, ip_address]}
- /ceilometer
BlockStorage:
type: OS::Heat::ResourceGroup