Merge "Add Ceilometer parameters for the overcloud"

1 files changed, 22 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: