openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Add Ceilometer parameters for the overcloud 

Change-Id: I205bb2c0bb7c9b956fd3e0d6b266bdf5afb48864
This commit is contained in:
Tomas Sedovic 2013-12-17 04:25:15 -05:00
parent c9ce27c981
commit ed3663bb15
2 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
nova-compute-instance.yaml
View File

@ -30,6 +30,21 @@ Parameters:
RabbitPassword:
Type: String
NoEcho: true
CeilometerComputeAgent:
Description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
Type: String
Default: ''
AllowedValues: ['', Present]
CeilometerMeteringSecret:
Default: unset
Description: Secret shared by the ceilometer services.
Type: String
NoEcho: true
CeilometerPassword:
Default: unset
Description: The password for the ceilometer service account.
Type: String
NoEcho: true
NovaComputeDriver:
Type: String
Default: libvirt.LibvirtDriver
@ -45,6 +60,8 @@ Parameters:
NoEcho: true
GlanceHost:
Type: String
CeilometerDSN:
Type: String
NovaDSN:
Type: String
NeutronDSN:
@ -122,6 +139,11 @@ Resources:
host: {Ref: NovaApiHost}
service-password:
Ref: NovaPassword
ceilometer:
db: {Ref: CeilometerDSN}
metering_secret: {Ref: CeilometerMeteringSecret}
service-password: {Ref: CeilometerPassword}
compute_agent: {Ref: CeilometerComputeAgent}
glance:
host: {Ref: GlanceHost}
keystone:

21
overcloud-source.yaml
View File

@ -44,6 +44,21 @@ Parameters:
Description: The password for the neutron service account, used by neutron agents.
Type: String
NoEcho: true
CeilometerComputeAgent:
Description: Indicates whether the Compute agent is present and expects nova-compute to be configured accordingly
Type: String
Default: ''
AllowedValues: ['', Present]
CeilometerMeteringSecret:
Default: unset
Description: Secret shared by the ceilometer services.
Type: String
NoEcho: true
CeilometerPassword:
Default: unset
Description: The password for the ceilometer service account.
Type: String
NoEcho: true
NovaComputeDriver:
Default: libvirt.LibvirtDriver
Type: String
@ -129,6 +144,7 @@ Resources:
NeutronHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
GlanceHost: {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ] }
NovaDSN: {"Fn::Join": ['', ['mysql://nova:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/nova']]}
CeilometerDSN: {"Fn::Join": ['', ['mysql://ceilometer:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/ceilometer']]}
NeutronDSN: {"Fn::Join": ['', ['mysql://neutron:unset@', {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [notcompute, networks]} ]} ]}, '/neutron']]}
NeutronNetworkType: "gre"
NeutronEnableTunnelling: "True"
@ -279,6 +295,11 @@ Resources:
ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
service-password:
Ref: NeutronPassword
ceilometer:
db: mysql://ceilometer:unset@localhost/ceilometer
metering_secret: {Ref: CeilometerMeteringSecret}
service-password:
Ref: CeilometerPassword
nova:
compute_driver: libvirt.LibvirtDriver
db: mysql://nova:unset@localhost/nova