diff options
| author |   Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-09-10 14:46:28 +0200 |
|---|---|---|
| committer | Stefan K. Berg <stefan.k.berg@ericsson.com> | 2015-09-10 14:46:28 +0200 |
| commit | 5d4a36b80fcd0b69e35e4d4f59cfb64a62453c28 (patch) | |
| tree | 623d5b318601c7105896d083c1f0fe2120ec05fa /fuel/build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb | |
| parent | c92ee8677af0dba1b9f28bc9a97cbf141d60e219 (diff) | |
Refactoring build system to support Fuel 6.1
As Fuel 6.1 has changed both Debian package handling (fetching
repositories from Internet) as well as Puppet packaging, the support
for patching these has been disabled.
The pre-deploy logic of Fuel has been removed together with a
number of patches applied on top of a Fuel build, among them
fixes for NTP, DNS and /etc/hosts injection.
Instead, when changed default behavior is required, this will be
introduced as Fuel plugins which more cleanly integrates into the
Fuel system, and also decouples additional functionality from the
ISO build stage.
Signed-off-by: Stefan K. Berg <stefan.k.berg@ericsson.com>
Diffstat (limited to 'fuel/build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb')
| -rw-r--r-- | fuel/build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/fuel/build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb b/fuel/build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb deleted file mode 100644 index 37ecfd7..0000000 --- a/fuel/build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb +++ /dev/null @@ -1,21 +0,0 @@ -############################################################################## -# Copyright (c) 2015 Ericsson AB and others. -# stefan.k.berg@ericsson.com -# jonas.bjurel@ericsson.com -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -tinker panic 0 -driftfile /var/lib/ntp/ntp.drift -statistics loopstats peerstats clockstats -filegen loopstats file loopstats type day enable -filegen peerstats file peerstats type day enable -filegen clockstats file clockstats type day enable -restrict -4 default kod notrap nomodify nopeer noquery -restrict -6 default kod notrap nomodify nopeer noquery -restrict 127.0.0.1 -restrict ::1 -<%= @file_content %> |