5 files changed, 122 insertions, 0 deletions
diff --git a/fuel/build/f_java/Makefile b/fuel/build/f_java/Makefile
new file mode 100644
index 0000000..759081f
--- /dev/null
+++ b/fuel/build/f_java/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 := openjdk-8-jdk
+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)
+	@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 ($(JAVA_MAIN_REPO),)
+	@cp release/pool/main/$(DEB_NAME) $(DEB_DEST)
+	@cp -Rvp puppet/modules/* $(PUPPET_DEST)
+endif
diff --git a/fuel/build/f_java/README b/fuel/build/f_java/README
new file mode 100644
index 0000000..776d47a
--- /dev/null
+++ b/fuel/build/f_java/README
@@ -0,0 +1,44 @@
+##############################################################################
+# 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
+##############################################################################
+
+This directory adds the openjdk-8-jdk 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_java has the following structure:
+.
++--------+----------+-----------+
+         |          |           |
+      puppet/    Makefile     README
+         |                  (this file)
+         |
+         |
+      modules/
+         |
+         |
+         |
+       opnfv/
+         |
+         |
+         |
+     manifests/
+         |
+         |
+         |
+      java.pp
+
+Makefile:
+Invoked by the git root Makefile, it pulls the openjdk-8-jdk 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
+
+java.pp:
+Controls the installation and configuration of java
diff --git a/fuel/build/f_java/puppet/modules/opnfv/manifests/java.pp b/fuel/build/f_java/puppet/modules/opnfv/manifests/java.pp
new file mode 100644
index 0000000..26e7c39
--- /dev/null
+++ b/fuel/build/f_java/puppet/modules/opnfv/manifests/java.pp
@@ -0,0 +1,11 @@
+class opnfv::java {
+  if $::osfamily == 'Debian' {
+    case $::fuel_settings['role'] {
+      /controller/: {
+        package { 'openjdk-8-jdk':
+          ensure => installed,
+        }
+      }
+    }
+  }
+}
diff --git a/fuel/build/f_java/testing/README b/fuel/build/f_java/testing/README
new file mode 100644
index 0000000..c0ef7d6
--- /dev/null
+++ b/fuel/build/f_java/testing/README
@@ -0,0 +1,12 @@
+##############################################################################
+# 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_java/testing/fake_init.pp b/fuel/build/f_java/testing/fake_init.pp
new file mode 100644
index 0000000..237b0c1
--- /dev/null
+++ b/fuel/build/f_java/testing/fake_init.pp
@@ -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
+##############################################################################
+
+$fuel_settings = parseyaml($astute_settings_yaml)
+
+include opnfv::java