summaryrefslogtreecommitdiffstats
path: root/fuel/build/f_ntp/puppet/modules/opnfv/manifests
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2015-09-10 14:46:28 +0200
committerStefan K. Berg <stefan.k.berg@ericsson.com>2015-09-14 13:53:11 +0200
commit07f4e6531023cbf742e7d187c6a0ee0800b64e01 (patch)
treea03c4311c4b9ac58d4105b5c3ac4741901146e8a /fuel/build/f_ntp/puppet/modules/opnfv/manifests
parent2c06022aa12ec8fc0ac3e50de36b900c92bf9817 (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/manifests')
-rw-r--r--fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp80
1 files changed, 0 insertions, 80 deletions
diff --git a/fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp b/fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
deleted file mode 100644
index c5dce1b..0000000
--- a/fuel/build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
+++ /dev/null
@@ -1,80 +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
-##############################################################################
-
-# Class: Ntp
-#
-# Add Ntp content passed through astute.yaml into ntp.conf depending on the role
-#
-# Suitable yaml content:
-# <begin>
-# opnfv:
-# ntp:
-# controller: |
-# line 1
-# line 2
-# compute: |
-# line 1
-# line 2
-# <end>
-#
-#
-#
-
-class opnfv::ntp(
- $file='/etc/ntp.conf'
-) {
-
- case $::operatingsystem {
- centos, redhat: {
- $service_name = 'ntpd'
- }
- debian, ubuntu: {
- $service_name = 'ntp'
- }
- }
-
- if $::fuel_settings['role'] {
- if ($::fuel_settings['opnfv'] and
- $::fuel_settings['opnfv']['ntp']) {
- case $::fuel_settings['role'] {
- /controller/: {
- if $::fuel_settings['opnfv']['ntp']['controller'] {
- $template = 'opnfv/ntp.conf.controller.erb'
- $file_content = $::fuel_settings['opnfv']['ntp']['controller']
- }
- }
- /compute/: {
- if $::fuel_settings['opnfv']['ntp']['compute'] {
- $template = 'opnfv/ntp.conf.compute.erb'
- $file_content = $::fuel_settings['opnfv']['ntp']['compute']
- }
- }
- }
- }
- }
-
- if $file_content {
- package { 'ntp':
- ensure => installed,
- }
-
- file { $file:
- content => template($template),
- notify => Service['ntp'],
- }
-
- service { 'ntp':
- ensure => running,
- name => $service_name,
- enable => true,
- require => [ Package['ntp'], File[$file]]
- }
- }
-}