Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add parameters for Veritas HyperScale distributed setup.
[apex-tripleo-heat-templates.git]
/
puppet
/
services
/
ceph-external.yaml
diff --git
a/puppet/services/ceph-external.yaml
b/puppet/services/ceph-external.yaml
index
3d64cf4
..
97e4415
100644
(file)
--- a/
puppet/services/ceph-external.yaml
+++ b/
puppet/services/ceph-external.yaml
@@
-1,4
+1,4
@@
-heat_template_version:
ocata
+heat_template_version:
pike
description: >
Ceph External service.
description: >
Ceph External service.
@@
-27,23
+27,16
@@
parameters:
GlanceRbdPoolName:
default: images
type: string
GlanceRbdPoolName:
default: images
type: string
- GlanceBackend:
- default: swift
- description: The short name of the Glance backend to use. Should be one
- of swift, rbd, or file
- type: string
- constraints:
- - allowed_values: ['swift', 'file', 'rbd']
GnocchiRbdPoolName:
default: metrics
type: string
GnocchiRbdPoolName:
default: metrics
type: string
- NovaEnableRbdBackend:
- default: false
- description: Whether to enable or not the Rbd backend for Nova
- type: boolean
NovaRbdPoolName:
default: vms
type: string
NovaRbdPoolName:
default: vms
type: string
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@
-76,16
+69,6
@@
parameters:
clients using older Ceph servers.
type: string
clients using older Ceph servers.
type: string
-conditions:
- glance_multiple_locations:
- and:
- - equals:
- - get_param: GlanceBackend
- - rbd
- - equals:
- - get_param: NovaEnableRbdBackend
- - true
-
outputs:
role_data:
description: Role data for the Ceph External service.
outputs:
role_data:
description: Role data for the Ceph External service.
@@
-122,8
+105,5
@@
outputs:
- ceph-base
- ceph-mon
- ceph-osd
- ceph-base
- ceph-mon
- ceph-osd
- service_config_settings:
- glance_api:
- glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
step_config: |
include ::tripleo::profile::base::ceph::client
step_config: |
include ::tripleo::profile::base::ceph::client