summaryrefslogtreecommitdiffstats
path: root/fuel-build/f_ntp/puppet/modules/opnfv
diff options
context:
space:
mode:
authorJonas Bjurel <jonas.bjurel@ericsson.com>2015-03-02 22:46:45 +0100
committerJonas Bjurel <jonas.bjurel@ericsson.com>2015-03-09 23:00:13 +0100
commit6cb518c68eb136ad448e96716ef8b1348440949f (patch)
tree757551a8efdc4e85e19fc1b0f27555825580e5c9 /fuel-build/f_ntp/puppet/modules/opnfv
parent1e106bbaca2780c10bd02b4e5fa3702d36acdf39 (diff)
Starting point for ODL Integration
***CAN BE MERGED*** - ODL build and installation (puppet manifests) including needed dependencies - Modified in accordance with Randy Levensalors comments - Added chmod 4755 /bin/fusermount due to that lately some systems dont install fuseiso withe SUID set for fusermount. Investing ongoing on why and why not consistent. - Rebased with master - ODL disabled in top Make (enable it by uncommenting the odl dirs - Removed white spaces - Hopefully fixed an issue with the docker ubuntu repos, added --no-cache=true to the fuel/docker/Make file. TODO: - Refactor collecting ODL and Java dependencies to one common place - Refactoring top Makefile - Adding CI hooks for build and deploy - Finishing integration plumbing wit Neutron/ML2 and OVS/OVSDB Change-Id: I13dd4d3a72d099316dfaa9f7cd9140781be2397b Signed-off-by: Jonas Bjurel <jonas.bjurel@ericsson.com>
Diffstat (limited to 'fuel-build/f_ntp/puppet/modules/opnfv')
-rw-r--r--fuel-build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp71
-rw-r--r--fuel-build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.compute.erb21
-rw-r--r--fuel-build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.controller.erb21
3 files changed, 0 insertions, 113 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 8180e3d..0000000
--- a/fuel-build/f_ntp/puppet/modules/opnfv/manifests/ntp.pp
+++ /dev/null
@@ -1,71 +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'
-) {
-
- 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,
- enable => true,
- require => [ Package['ntp'], File[$file]]
- }
- }
-}
-
diff --git a/fuel-build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.compute.erb b/fuel-build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.compute.erb
deleted file mode 100644
index 37ecfd7..0000000
--- a/fuel-build/f_ntp/puppet/modules/opnfv/templates/ntp.conf.compute.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 %>
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 %>