summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2014-01-08 13:01:04 +0000
committerGerrit Code Review <review@openstack.org>2014-01-08 13:01:04 +0000
commit5b3593cc0d2b5b51cbfb03041cfb6c3bc05f4381 (patch)
treeb61b012e5d7c8d98022c42c79a972aa89be1882a
parent31f519ef88352fd4c439c56df87b36e73355778b (diff)
parented3663bb150d05e7a300336e5c07d18d3afb5ab8 (diff)
Merge "Add Ceilometer parameters for the overcloud"
-rw-r--r--nova-compute-instance.yaml22
-rw-r--r--overcloud-source.yaml21
2 files changed, 43 insertions, 0 deletions
diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml
index e10b1dc5..229615ad 100644
--- a/nova-compute-instance.yaml
+++ b/nova-compute-instance.yaml
@@ -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:
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