From 6cb518c68eb136ad448e96716ef8b1348440949f Mon Sep 17 00:00:00 2001 From: Jonas Bjurel Date: Mon, 2 Mar 2015 22:46:45 +0100 Subject: 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 --- fuel/build/f_ca_cert/Makefile | 42 ++++++++++++++++++++++ .../puppet/modules/opnfv/manifests/ca_cert.pp | 11 ++++++ 2 files changed, 53 insertions(+) create mode 100644 fuel/build/f_ca_cert/Makefile create mode 100644 fuel/build/f_ca_cert/puppet/modules/opnfv/manifests/ca_cert.pp (limited to 'fuel/build/f_ca_cert') diff --git a/fuel/build/f_ca_cert/Makefile b/fuel/build/f_ca_cert/Makefile new file mode 100644 index 0000000..83069cf --- /dev/null +++ b/fuel/build/f_ca_cert/Makefile @@ -0,0 +1,42 @@ +############################################################################## +# 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 +############################################################################## + +TOP := $(shell pwd) +include ../config.mk + +PACKAGE := ca-certificates +VERSION := 20130906ubuntu2_all +DEB_NAME := $(PACKAGE)_$(VERSION).deb + +.PHONY: all +all: release/pool/main/$(DEB_NAME) + +release/pool/main/$(DEB_NAME): +ifeq ($(CERT_MAIN_REPO),) + @echo "No config-spec target for Java, nothing to build" +else + @mkdir -p release/pool/main && \ + cd release/pool/main && \ + wget -N $(CERT_MAIN_REPO)/$(DEB_NAME) + @lintian release/pool/main/$(DEB_NAME) +endif + +.PHONY: clean +clean: + @rm -rf release + @rm -f $(DEB_DEST)/$(DEB_NAME) + + +.PHONY: release +release:release/pool/main/$(DEB_NAME) +ifneq ($(CERT_MAIN_REPO),) + @cp release/pool/main/$(DEB_NAME) $(DEB_DEST) + @cp -Rvp puppet/modules/* $(PUPPET_DEST) +endif diff --git a/fuel/build/f_ca_cert/puppet/modules/opnfv/manifests/ca_cert.pp b/fuel/build/f_ca_cert/puppet/modules/opnfv/manifests/ca_cert.pp new file mode 100644 index 0000000..69b5d23 --- /dev/null +++ b/fuel/build/f_ca_cert/puppet/modules/opnfv/manifests/ca_cert.pp @@ -0,0 +1,11 @@ +class opnfv::ca_cert { + if $::osfamily == 'Debian' { + case $::fuel_settings['role'] { + /controller/: { + package { 'ca-certificates': + ensure => installed, + } + } + } + } +} -- cgit 1.2.3-korg