moved iso2 to iso

Makefile

@@ -1,7 +1,7 @@
 
 BUILD_DIR:=build
 
-MODULES=gnupg bootstrap iso2 test
+MODULES=gnupg bootstrap iso test
 
 .PHONY: all clean test help FORCE
 

README.md

@@ -82,7 +82,7 @@ Layout
         others obvious
     devops/ - Mirantis CI framework, used by integration tests (./test/integration/). Installed on the master, not slave.
     gnupg/
-    iso2/ - creating a main iso to install admin node (isobuild.sh is obsolete, but it is still convenient to use it from time to time to look how some things work), bootstrap images is included into main iso [TODO How does it differ from bootstrap/ and bootstrap2/ ?]
+    iso/ - creating a main iso to install admin node (isobuild.sh is obsolete, but it is still convenient to use it from time to time to look how some things work), bootstrap images is included into main iso [TODO How does it differ from bootstrap/ and bootstrap2/ ?]
     nailgun/ - server
         manage.py, run_tests.sh - django standard
         monitor.py - restart server when django conf files change

iso/isobuild.sh

@@ -30,7 +30,7 @@ NEWISONAME=nailgun-ubuntu-${VERSION}-amd64
 MIRROR="http://ru.archive.ubuntu.com/ubuntu"
 REQDEB=`cat ${REPO}/requirements-deb.txt | grep -v "^\s*$" | grep -v "^\s*#"`
 
-BASEDIR=/var/tmp/build_iso2
+BASEDIR=/var/tmp/build_iso
 
 ORIG=${BASEDIR}/orig
 NEW=${BASEDIR}/new

iso/module.mk

@@ -196,8 +196,8 @@ $/isoroot-keyring.done: $/isoroot-pool.done $/debian/ubuntu-keyring/.done
 $/isoroot-packages.done: $/isoroot-pool.done $/isoroot-keyring.done
 	$(ACTION.TOUCH)
 
-$/isoroot-isolinux.done: $/isoroot-infra.done $(addprefix iso2/stage/,$(call find-files,iso2/stage))
-	rsync -a iso2/stage/ $(ISOROOT)
+$/isoroot-isolinux.done: $/isoroot-infra.done $(addprefix iso/stage/,$(call find-files,iso/stage))
+	rsync -a iso/stage/ $(ISOROOT)
 	$(ACTION.TOUCH)
 
 $/isoroot.done: \
@@ -212,7 +212,7 @@ $/isoroot.done: \
 		$(ISOROOT)/gnupg \
 		$(addprefix $(ISOROOT)/gnupg/,$(call find-files,gnupg)) \
 		$(ISOROOT)/sync \
-		$(addprefix $(ISOROOT)/sync/,$(call find-files,iso2/sync)) \
+		$(addprefix $(ISOROOT)/sync/,$(call find-files,iso/sync)) \
 		$(addprefix $(ISOROOT)/indices/,$(call find-files,$(BINARIES_DIR)/ubuntu/$(ISO_RELEASE)/indices)) \
 		$(addprefix $(ISOROOT)/nailgun/,$(call find-files,nailgun)) \
 		$(addprefix $(ISOROOT)/nailgun/bin/,create_release install_cookbook deploy) \
@@ -408,11 +408,11 @@ $(ISOROOT)/gnupg:
 $(ISOROOT)/gnupg/%: gnupg/% ; $(ACTION.COPY)
 $(ISOROOT)/sync:
 	mkdir -p $@
-$(ISOROOT)/sync/%: iso2/sync/% ; $(ACTION.COPY)
+$(ISOROOT)/sync/%: iso/sync/% ; $(ACTION.COPY)
 $(ISOROOT)/indices/override.$(ISO_RELEASE).extra.main: $/override.$(ISO_RELEASE).extra.main ; $(ACTION.COPY)
 $(ISOROOT)/indices/%: $(BINARIES_DIR)/ubuntu/$(ISO_RELEASE)/indices/% ; $(ACTION.COPY)
 $(ISOROOT)/nailgun/cookbooks/%: cookbooks/% ; $(ACTION.COPY)
-$(ISOROOT)/nailgun/solo/%: iso2/solo/% ; $(ACTION.COPY)
+$(ISOROOT)/nailgun/solo/%: iso/solo/% ; $(ACTION.COPY)
 $(ISOROOT)/nailgun/bin/%: bin/% ; $(ACTION.COPY)
 $(ISOROOT)/nailgun/%: nailgun/% ; $(ACTION.COPY)
 $(ISOROOT)/eggs: