5 files changed, 0 insertions, 125 deletions
diff --git a/fuel/build/f_jre/Makefile b/fuel/build/f_jre/Makefile
deleted file mode 100644
index 43f5e76..0000000
--- a/fuel/build/f_jre/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-##############################################################################
-# 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
deleted file mode 100644
index 24e4cdd..0000000
--- a/fuel/build/f_jre/README
+++ /dev/null
@@ -1,44 +0,0 @@
-
-##############################################################################
-# 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
deleted file mode 100644
index 3c342d2..0000000
--- a/fuel/build/f_jre/puppet/modules/opnfv/manifests/jre.pp
+++ /dev/null
@@ -1,14 +0,0 @@
-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
deleted file mode 100644
index 028230d..0000000
--- a/fuel/build/f_jre/testing/README
+++ /dev/null
@@ -1,13 +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
-##############################################################################
-
-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
deleted file mode 100644
index 83c7adb..0000000
--- a/fuel/build/f_jre/testing/fake_init.pp
+++ /dev/null
@@ -1,13 +0,0 @@
-##############################################################################
-# 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
-