From 49915844e0c709ab05e1c882eb5936d810850a94 Mon Sep 17 00:00:00 2001
From: James Slagle <jslagle@redhat.com>
Date: Wed, 26 Feb 2014 15:53:17 -0500
Subject: Add GlanceLogFile and GlanceNotifierStrategy

Expose 2 new parameters to control glance configuration:
- GlanceLogFile
- GlanceNotifierStrategy

This will allow the glance configuration options log_file and
notifier_strategy to be set in glance-api.conf and glance-registry.conf

Change-Id: I1af1ecfdfe0859f2baba4579aab6e947a2a54308
---
 notcompute.yaml        | 12 ++++++++++++
 overcloud-source.yaml  | 12 ++++++++++++
 undercloud-source.yaml | 12 ++++++++++++
 3 files changed, 36 insertions(+)

diff --git a/notcompute.yaml b/notcompute.yaml
index b097dd02..1f96ac9a 100644
--- a/notcompute.yaml
+++ b/notcompute.yaml
@@ -31,6 +31,14 @@ Parameters:
     Description: Password for connecting to glance database
     Type: String
     NoEcho: true
+  GlanceNotifierStrategy:
+    Description: Strategy to use for Glance notification queue
+    Type: String
+    Default: noop
+  GlanceLogFile:
+    Description: The filepath of the file to use for logging messages from Glance.
+    Type: String
+    Default: ''
   HeatDBPassword:
     Description: Password for accessing Heat database.
     Type: String
@@ -130,6 +138,10 @@ Resources:
             - - 'mysql://glance:'
               - {Ref: GlanceDBPassword}
               - '@127.0.0.1/glance'
+          notifier-strategy:
+            Ref: GlanceNotifierStrategy
+          log-file:
+            Ref: GlanceLogFile
       heat:
         db:
           Fn::Join:
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index 6d21a4dc..d9a7b7a4 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -26,6 +26,14 @@ Parameters:
     Description: The password for the glance service account, used by the glance services.
     Type: String
     NoEcho: true
+  GlanceNotifierStrategy:
+    Description: Strategy to use for Glance notification queue
+    Type: String
+    Default: noop
+  GlanceLogFile:
+    Description: The filepath of the file to use for logging messages from Glance.
+    Type: String
+    Default: ''
   HeatPassword:
     Default: unset
     Description: The password for the Heat service account, used by the Heat services.
@@ -293,6 +301,10 @@ Resources:
         swift-store-user: service:glance
         swift-store-key:
           Ref: GlancePassword
+        notifier-strategy:
+          Ref: GlanceNotifierStrategy
+        log-file:
+          Ref: GlanceLogFile
       heat:
         admin_password:
           Ref: HeatPassword
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index efce1e87..07f53dfd 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -24,6 +24,14 @@ Parameters:
     Description: The password for the glance service account, used by the glance services.
     Type: String
     NoEcho: true
+  GlanceNotifierStrategy:
+    Description: Strategy to use for Glance notification queue
+    Type: String
+    Default: noop
+  GlanceLogFile:
+    Description: The filepath of the file to use for logging messages from Glance.
+    Type: String
+    Default: ''
   KeyName:
     Default: default
     Description: Name of an existing EC2 KeyPair to enable SSH access to the instances
@@ -113,6 +121,10 @@ Resources:
         host: 127.0.0.1
         service-password:
           Ref: GlancePassword
+          notifier-strategy:
+            Ref: GlanceNotifierStrategy
+          log-file:
+            Ref: GlanceLogFile
       heat:
         admin_password:
           Ref: HeatPassword
-- 
cgit 1.2.3-korg