diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-06-21 16:19:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-06-21 16:19:30 +0000 |
| commit | a2614491be1cae82e4b04337184b75644633ce3f (patch) | |
| tree | ba4cf25e3c25c770f5cb0296c3ce816b13d9a94a /puppet/controller.yaml | |
| parent | d6eec7809a57e21faea1737a0339e1f84b96b28a (diff) | |
| parent | 296bffde893dbbf36c62d664e24e2584b89b8070 (diff) | |
Merge "Composable roles within services - NTP"
Diffstat (limited to 'puppet/controller.yaml')
| -rw-r--r-- | puppet/controller.yaml | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml index 516a9ee8..22b773c1 100644 --- a/puppet/controller.yaml +++ b/puppet/controller.yaml @@ -284,10 +284,6 @@ parameters: description: The password for the nova service and db account, used by nova-api. type: string hidden: true - NtpServer: - default: '' - description: Comma-separated list of ntp servers - type: comma_delimited_list PcsdPassword: type: string description: The password for the 'pcsd' user. @@ -746,7 +742,6 @@ resources: rabbit_cookie: {get_param: RabbitCookie} rabbit_client_use_ssl: {get_param: RabbitClientUseSSL} rabbit_client_port: {get_param: RabbitClientPort} - ntp_servers: {get_param: NtpServer} timezone: {get_param: TimeZone} control_virtual_interface: {get_param: ControlVirtualInterface} public_virtual_interface: {get_param: PublicVirtualInterface} @@ -1064,7 +1059,6 @@ resources: # Misc memcached_ipv6: {get_input: memcached_ipv6} memcached::listen_ip: {get_input: memcached_network} - ntp::servers: {get_input: ntp_servers} timezone::timezone: {get_input: timezone} control_virtual_interface: {get_input: control_virtual_interface} public_virtual_interface: {get_input: public_virtual_interface} |