diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-03-05 10:53:18 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-03-05 10:53:18 +0000 |
| commit | 1f75fd8fd3086febb5ac37cb921fa82eb2cc8c8e (patch) | |
| tree | 5b750d0c00d9a31b8eadaa0c460ab1a67be5d3b2 | |
| parent | a5516561a6dda085e641c807caa83abae3556bf2 (diff) | |
| parent | 49915844e0c709ab05e1c882eb5936d810850a94 (diff) | |
Merge "Add GlanceLogFile and GlanceNotifierStrategy"
| -rw-r--r-- | notcompute.yaml | 12 | ||||
| -rw-r--r-- | overcloud-source.yaml | 12 | ||||
| -rw-r--r-- | undercloud-source.yaml | 12 |
3 files changed, 36 insertions, 0 deletions
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 d9e307b8..d3604646 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -30,6 +30,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. @@ -297,6 +305,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 |