diff options
author | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-02 22:46:45 +0100 |
---|---|---|
committer | Jonas Bjurel <jonas.bjurel@ericsson.com> | 2015-03-09 23:00:13 +0100 |
commit | 6cb518c68eb136ad448e96716ef8b1348440949f (patch) | |
tree | 757551a8efdc4e85e19fc1b0f27555825580e5c9 /fuel/build/f_jre | |
parent | 1e106bbaca2780c10bd02b4e5fa3702d36acdf39 (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_jre')
-rw-r--r-- | fuel/build/f_jre/Makefile | 41 | ||||
-rw-r--r-- | fuel/build/f_jre/README | 44 | ||||
-rw-r--r-- | fuel/build/f_jre/puppet/modules/opnfv/manifests/jre.pp | 14 | ||||
-rw-r--r-- | fuel/build/f_jre/testing/README | 13 | ||||
-rw-r--r-- | fuel/build/f_jre/testing/fake_init.pp | 13 |
5 files changed, 125 insertions, 0 deletions
diff --git a/fuel/build/f_jre/Makefile b/fuel/build/f_jre/Makefile new file mode 100644 index 0000000..43f5e76 --- /dev/null +++ b/fuel/build/f_jre/Makefile @@ -0,0 +1,41 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# daniel.smith@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 := openjdk-8-jre +VERSION := 8u40~b09-1_amd64 +DEB_NAME := $(PACKAGE)_$(VERSION).deb + +.PHONY: all +all: release/pool/main/$(DEB_NAME) + +release/pool/main/$(DEB_NAME): +ifeq ($(JAVA_MAIN_REPO),) + @echo "No config-spec target for Java, nothing to build" +else + @mkdir -p release/pool/main && \ + cd release/pool/main && \ + wget -N $(JAVA_MAIN_REPO)/$(DEB_NAME) +endif + +.PHONY: clean +clean: + @rm -rf release + @rm -f $(DEB_DEST)/$(DEB_NAME) + + +.PHONY: release +release:release/pool/main/$(DEB_NAME) +ifneq ($(JAVA_MAIN_REPO),) + @cp release/pool/main/$(DEB_NAME) $(DEB_DEST) + @cp -Rvp puppet/modules/* $(PUPPET_DEST) +endif + diff --git a/fuel/build/f_jre/README b/fuel/build/f_jre/README new file mode 100644 index 0000000..24e4cdd --- /dev/null +++ b/fuel/build/f_jre/README @@ -0,0 +1,44 @@ + +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# daniel.smith@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 +############################################################################## + +This directory adds the openjdk-8-jre Java package and related puppet +deployment manifest such that it gets built into the .iso image an deployed +on the stack controller cluster. + +The f_jre has the following structure: +. ++--------+----------+-----------+ + | | | + puppet/ Makefile README + | (this file) + | + | + modules/ + | + | + | + opnfv/ + | + | + | + manifests/ + | + | + | + jre.pp + +Makefile: +Invoked by the git root Makefile, it pulls the openjdk-8-jre deb package +from a propper mirror and pushes i together with the manifests to a fuel +build artifact directory, such that it eventually gets built into the new +fuel .iso + +jre.pp: +Controls the installation and configuration of java diff --git a/fuel/build/f_jre/puppet/modules/opnfv/manifests/jre.pp b/fuel/build/f_jre/puppet/modules/opnfv/manifests/jre.pp new file mode 100644 index 0000000..3c342d2 --- /dev/null +++ b/fuel/build/f_jre/puppet/modules/opnfv/manifests/jre.pp @@ -0,0 +1,14 @@ +class opnfv::jre { + if $::osfamily == 'Debian' { + + + case $::fuel_settings['role'] { + /controller/: { + package { 'openjdk-8-jre': + ensure => installed, + } + } + } + } +} + diff --git a/fuel/build/f_jre/testing/README b/fuel/build/f_jre/testing/README new file mode 100644 index 0000000..028230d --- /dev/null +++ b/fuel/build/f_jre/testing/README @@ -0,0 +1,13 @@ +############################################################################## +# 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 +############################################################################## + +In order to test the functionality without performing a full deployment, run "puppet apply" on the +fake_init.pp which will call only the opnfv::java class. + diff --git a/fuel/build/f_jre/testing/fake_init.pp b/fuel/build/f_jre/testing/fake_init.pp new file mode 100644 index 0000000..83c7adb --- /dev/null +++ b/fuel/build/f_jre/testing/fake_init.pp @@ -0,0 +1,13 @@ +############################################################################## +# Copyright (c) 2015 Ericsson AB and others. +# daniel.smith@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 +############################################################################## + +$fuel_settings = parseyaml($astute_settings_yaml) + +include opnfv::jre + |