diff options
Diffstat (limited to 'build/f_isoroot/f_kscfg')
-rw-r--r-- | build/f_isoroot/f_kscfg/Makefile | 50 | ||||
-rw-r--r-- | build/f_isoroot/f_kscfg/README | 18 | ||||
-rw-r--r-- | build/f_isoroot/f_kscfg/ks.cfg.patch | 31 |
3 files changed, 0 insertions, 99 deletions
diff --git a/build/f_isoroot/f_kscfg/Makefile b/build/f_isoroot/f_kscfg/Makefile deleted file mode 100644 index cfd433f8d..000000000 --- a/build/f_isoroot/f_kscfg/Makefile +++ /dev/null @@ -1,50 +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 -############################################################################## - -TOP := $(shell pwd) - -.PHONY: all -all: ks.cfg.iso - @mkdir -p release - grep -q OpenStack_Fuel ks.cfg.iso - sed "s/OpenStack_Fuel/$(PRODNO)_$(REVSTATE)/g" ks.cfg.iso > ks.cfg - /usr/bin/patch -p0 < ks.cfg.patch - @cp ks.cfg.iso release/ks.cfg.orig - @cp ks.cfg release/ks.cfg - -ks.cfg.iso: - 7z -so x $(ISOCACHE) ks.cfg > ks.cfg.iso - -.PHONY: clean -clean: - @rm -rf release ks.cfg.iso ks.cfg - -.PHONY: release -release: all - @cp -Rvp release/* ../release - -############################################################################# -# Cache operations - only used when building through ci/build.sh -############################################################################# - -# Clean local data related to caching - called prior to ordinary build -.PHONY: clean-cache -clean-cache: clean - @echo "clean-cache not implemented" - -# Try to download cache - called prior to ordinary build -.PHONY: get-cache -get-cache: - @echo "get-cache not implemented" - -# Store cache if not already stored - called after ordinary build -.PHONY: put-cache -put-cache: - @echo "put-cache not implemented" diff --git a/build/f_isoroot/f_kscfg/README b/build/f_isoroot/f_kscfg/README deleted file mode 100644 index c85efde77..000000000 --- a/build/f_isoroot/f_kscfg/README +++ /dev/null @@ -1,18 +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 -############################################################################## - -This function modifies the ks.cfg of the Fuel master to -make copy whatever is in the top level opnfv directory -of the ISO (populated by, for example, f_configfrontend) to -/opt/opnfv. In the end this is where the installation -parts will evolve. - -This is also the place to force the installation to overwrite -the disk (set forceformat="yes" instead of "no"). diff --git a/build/f_isoroot/f_kscfg/ks.cfg.patch b/build/f_isoroot/f_kscfg/ks.cfg.patch deleted file mode 100644 index a6840e479..000000000 --- a/build/f_isoroot/f_kscfg/ks.cfg.patch +++ /dev/null @@ -1,31 +0,0 @@ -*** /dev/null 2016-04-26 10:10:11.481587709 +0200 ---- ks.cfg 2016-04-26 10:10:11.481587709 +0200 -*************** -*** 579,584 **** ---- 579,592 ---- - - EOF - -+ ######### OPNFV addition BEGIN ############ -+ # Copy data into /opt/opnfv -+ # TODO: This ought to be a package instead! -+ mkdir -p /opt/opnfv -+ cp -r ${SOURCE}/opnfv /opt -+ cp ${SOURCE}/gitinfo.txt / -+ ######### OPNFV addition END ############ -+ - # Unmounting source - umount -f ${SOURCE} - rm -rf ${SOURCE} -*************** -*** 647,650 **** - /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \ - /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif} - fi -! %end -\ No newline at end of file ---- 655,658 ---- - /etc/sysconfig/network-scripts/ifcfg-${ifname%%:*} > \ - /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-${adminif} - fi -! %end |