aboutsummaryrefslogtreecommitdiffstats
path: root/overcloud.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-06-21 16:19:30 +0000
committerGerrit Code Review <review@openstack.org>2016-06-21 16:19:30 +0000
commita2614491be1cae82e4b04337184b75644633ce3f (patch)
treeba4cf25e3c25c770f5cb0296c3ce816b13d9a94a /overcloud.yaml
parentd6eec7809a57e21faea1737a0339e1f84b96b28a (diff)
parent296bffde893dbbf36c62d664e24e2584b89b8070 (diff)
Merge "Composable roles within services - NTP"
Diffstat (limited to 'overcloud.yaml')
-rw-r--r--overcloud.yaml3
1 files changed, 2 insertions, 1 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index 60424885..c9c46c2b 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -221,6 +221,7 @@ parameters:
description: The password for the nova service account, used by nova-api.
type: string
hidden: true
+ #TODO(ccamacho): Remove after landing Ntp in all roles
NtpServer:
default: ''
description: Comma-separated list of ntp servers
@@ -594,6 +595,7 @@ parameters:
- OS::TripleO::Services::NovaScheduler
- OS::TripleO::Services::NovaConsoleauth
- OS::TripleO::Services::NovaVncproxy
+ - 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 Controllers.
@@ -867,7 +869,6 @@ resources:
NeutronMetadataProxySharedSecret: {get_param: NeutronMetadataProxySharedSecret}
NovaIPv6: {get_param: NovaIPv6}
NovaPassword: {get_param: NovaPassword}
- NtpServer: {get_param: NtpServer}
PcsdPassword: {get_resource: PcsdPassword}
PublicVirtualInterface: {get_param: PublicVirtualInterface}
RabbitPassword: {get_param: RabbitPassword}