diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-22 01:55:45 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-22 01:55:45 +0000 |
| commit | 791b32d506267a2f12f54b6a2ebfd1478d97c25c (patch) | |
| tree | cda630822ea77c1ae83c4fc2d7eaa9d5a39d2f72 /overcloud.yaml | |
| parent | 5210355461cbaded0c66fee258245699ec469cdc (diff) | |
| parent | 1bab553fd591810b242963b394daad6019e78f2a (diff) | |
Merge "Composable roles within services - NTP - ObjectStorage"
Diffstat (limited to 'overcloud.yaml')
| -rw-r--r-- | overcloud.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/overcloud.yaml b/overcloud.yaml index a1a1a312..61956b29 100644 --- a/overcloud.yaml +++ b/overcloud.yaml @@ -659,7 +659,8 @@ parameters: description: Optional scheduler hints to pass to nova default: {} ObjectStorageServices: - default: [] + default: + - OS::TripleO::Services::Ntp 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. @@ -1065,7 +1066,6 @@ resources: Image: {get_param: SwiftStorageImage} Replicas: { get_param: SwiftReplicas} TimeZone: {get_param: TimeZone} - NtpServer: {get_param: NtpServer} UpdateIdentifier: {get_param: UpdateIdentifier} ServiceNetMap: {get_param: ServiceNetMap} Hostname: |