summaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
Diffstat (limited to 'overcloud.yaml')
-rw-r--r--overcloud.yaml55
1 files changed, 24 insertions, 31 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 474fcffb..85f344ab 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
@@ -508,10 +496,6 @@ parameters:
description: A random string to be used as a salt when hashing to determine mappings in the ring.
type: string
hidden: true
- SwiftPassword:
- description: The password for the swift service account, used by the swift proxy services.
- type: string
- hidden: true
SwiftMountCheck:
default: 'false'
description: Value of mount_check in Swift account/container/object -server.conf
@@ -528,10 +512,6 @@ parameters:
type: number
default: 3
description: How many replicas to use in the swift rings.
- SaharaPassword:
- description: The password for the sahara service account.
- type: string
- hidden: true
# Compute-specific params
CeilometerComputeAgent:
@@ -643,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
@@ -654,8 +637,12 @@ parameters:
- OS::TripleO::Services::NeutronL3Agent
- OS::TripleO::Services::NeutronMetadataAgent
- OS::TripleO::Services::RabbitMQ
- - OS::TripleO::Services::Loadbalancer
+ - OS::TripleO::Services::HAproxy
+ - OS::TripleO::Services::Keepalived
- OS::TripleO::Services::Memcached
+ - OS::TripleO::Services::SwiftProxy
+ - OS::TripleO::Services::Redis
+ - OS::TripleO::Services::NovaConductor
description: A list of service resources (configured in the Heat
resource_registry) which represent nested stacks
for each service that should get installed on the Controllers.
@@ -716,6 +703,14 @@ parameters:
type: json
description: Optional scheduler hints to pass to nova
default: {}
+ ObjectStorageServices:
+ default: []
+ description: A list of service resources (configured in the Heat
+ resource_registry) which represent nested stacks
+ for each service that should get installed on the ObjectStorage nodes.
+ Note this role currently only supports steps 2, 3 and 4 configuration.
+ type: comma_delimited_list
+
# Ceph storage specific parameters
CephStorageCount:
@@ -884,14 +879,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}
@@ -959,7 +946,6 @@ resources:
RabbitClientUseSSL: {get_param: RabbitClientUseSSL}
RabbitClientPort: {get_param: RabbitClientPort}
RedisPassword: {get_param: RedisPassword}
- SaharaPassword: {get_param: SaharaPassword}
SnmpdReadonlyUserName: {get_param: SnmpdReadonlyUserName}
SnmpdReadonlyUserPassword: {get_param: SnmpdReadonlyUserPassword}
RedisVirtualIP: {get_attr: [RedisVirtualIP, ip_address]}
@@ -968,7 +954,6 @@ resources:
SwiftMountCheck: {get_param: SwiftMountCheck}
SwiftMinPartHours: {get_param: SwiftMinPartHours}
SwiftPartPower: {get_param: SwiftPartPower}
- SwiftPassword: {get_param: SwiftPassword}
SwiftReplicas: { get_param: SwiftReplicas}
TimeZone: {get_param: TimeZone}
VirtualIP: {get_attr: [VipMap, net_ip_map, ctlplane]} # deprecated. Use per service VIP settings instead now.
@@ -1128,6 +1113,12 @@ resources:
SchedulerHints: {get_param: BlockStorageSchedulerHints}
NodeIndex: '%index%'
+ ObjectStorageServiceChain:
+ type: OS::TripleO::Services
+ properties:
+ Services: {get_param: ObjectStorageServices}
+ EndpointMap: {get_attr: [EndpointMap, endpoint_map]}
+
ObjectStorage:
type: OS::Heat::ResourceGroup
depends_on: Networks
@@ -1160,6 +1151,7 @@ resources:
ServerMetadata: {get_param: ServerMetadata}
SchedulerHints: {get_param: ObjectStorageSchedulerHints}
NodeIndex: '%index%'
+ ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, config_settings]}
CephStorageServiceChain:
type: OS::TripleO::Services
@@ -1580,6 +1572,7 @@ resources:
allnodes_extra: {get_attr: [AllNodesExtraConfig, config_identifier]}
objectstorage_config: {get_attr: [ObjectStorage, attributes, config_identifier]}
deployment_identifier: {get_param: DeployIdentifier}
+ StepConfig: {get_attr: [ObjectStorageServiceChain, step_config]}
BlockStorageNodesPostDeployment:
type: OS::TripleO::BlockStoragePostDeployment