aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud-source.yaml
diff options
context:
space:
mode:
authorTomas Sedovic <tsedovic@redhat.com>2013-12-17 04:25:15 -0500
committerTomas Sedovic <tsedovic@redhat.com>2014-01-02 12:07:34 +0100
commited3663bb150d05e7a300336e5c07d18d3afb5ab8 (patch)
treefc880f5773093a806fcb8a4cca3fddfe59d95c3f /overcloud-source.yaml
parentc9ce27c981d74c18f844fa71339c0177c3f76b28 (diff)
Add Ceilometer parameters for the overcloud
Change-Id: I205bb2c0bb7c9b956fd3e0d6b266bdf5afb48864
Diffstat (limited to 'overcloud-source.yaml')
-rw-r--r--overcloud-source.yaml21
1 files changed, 21 insertions, 0 deletions
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 754dbbee..ba05e280 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -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