summaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-04-28 11:37:32 -0500
committerEmilien Macchi <emilien@redhat.com>2016-06-02 12:21:49 -0400
commit27e457e0dd21f767efedbc4d0430b4cbd974db0d (patch)
tree1c67d5e5ee047d2b2eb7b0431a3abbd5a9b8caf1 /overcloud.yaml
parentbcd726f1242d78169e6a5687e998473c1043c622 (diff)
Switch Cinder Api/Scheduler/Volume to composable roles
Uses a shared cinder-base resource to do the database and messaging configuration for all three services. Depends-On: I3c6d5226eed5f0f852b0ad9476c7cd9a959fda69 Change-Id: I47c5fd190efca5f02e73fd22aba6cda573daf5cc
Diffstat (limited to 'overcloud.yaml')
-rw-r--r--overcloud.yaml23
1 files changed, 3 insertions, 20 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 82d7368e..0a580342 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -344,18 +344,6 @@ parameters:
default: 10280
description: The size of the loopback file used by the cinder LVM driver.
type: number
- CinderNfsMountOptions:
- default: ''
- description: >
- Mount options for NFS mounts used by Cinder NFS backend. Effective
- when CinderEnableNfsBackend is true.
- type: string
- CinderNfsServers:
- default: ''
- description: >
- NFS servers used by Cinder NFS backend. Effective when
- CinderEnableNfsBackend is true.
- type: comma_delimited_list
CinderPassword:
description: The password for the cinder service account, used by cinder-api.
type: string
@@ -635,6 +623,9 @@ parameters:
ControllerServices:
default:
+ - OS::TripleO::Services::CinderApi
+ - OS::TripleO::Services::CinderScheduler
+ - OS::TripleO::Services::CinderVolume
- OS::TripleO::Services::Keystone
- OS::TripleO::Services::GlanceApi
- OS::TripleO::Services::GlanceRegistry
@@ -885,14 +876,6 @@ resources:
CeilometerMeteringSecret: {get_param: CeilometerMeteringSecret}
CeilometerPassword: {get_param: CeilometerPassword}
CeilometerMeterDispatcher: {get_param: CeilometerMeterDispatcher}
- CinderLVMLoopDeviceSize: {get_param: CinderLVMLoopDeviceSize}
- CinderNfsMountOptions: {get_param: CinderNfsMountOptions}
- CinderNfsServers: {get_param: CinderNfsServers}
- CinderPassword: {get_param: CinderPassword}
- CinderISCSIHelper: {get_param: CinderISCSIHelper}
- CinderEnableNfsBackend: {get_param: CinderEnableNfsBackend}
- CinderEnableIscsiBackend: {get_param: CinderEnableIscsiBackend}
- CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
CloudDomain: {get_param: CloudDomain}
ControlVirtualInterface: {get_param: ControlVirtualInterface}
controllerExtraConfig: {get_param: controllerExtraConfig}