From ed3663bb150d05e7a300336e5c07d18d3afb5ab8 Mon Sep 17 00:00:00 2001
From: Tomas Sedovic <tsedovic@redhat.com>
Date: Tue, 17 Dec 2013 04:25:15 -0500
Subject: Add Ceilometer parameters for the overcloud

Change-Id: I205bb2c0bb7c9b956fd3e0d6b266bdf5afb48864
---
 nova-compute-instance.yaml | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)

(limited to 'nova-compute-instance.yaml')

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:
-- 
cgit 1.2.3-korg