openstack/fuel-main
Code Issues Proposed changes

Rebased on master and fixed some errors

Browse Source
This commit is contained in:
Vladimir Kozhukalov
2013-01-31 19:35:09 +04:00
parent a5ab7652fa
commit c736049870
5 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
bootstrap/module.mk
View File

@@ -78,7 +78,7 @@ $(BUILD_DIR)/bootstrap/linux: $(BUILD_DIR)/mirror/build.done
rm -r $(BUILD_DIR)/bootstrap/boot
touch $(BUILD_DIR)/bootstrap/linux
$(BUILD_DIR)/bootstrap/customize-initram-root.done: $(call depv,BOOTSTRAP_RPMS_CUSTOM)
$(BUILD_DIR)/bootstrap/customize-initram-root.done: export yum_local_repo:=$(yum_local_repo)
$(BUILD_DIR)/bootstrap/customize-initram-root.done: \
$(BUILD_DIR)/packages/rpm/build.done \
@@ -123,7 +123,7 @@ $(BUILD_DIR)/bootstrap/customize-initram-root.done: \
$(ACTION.TOUCH)
$(BUILD_DIR)/bootstrap/prepare-initram-root.done: $(call depv,BOOTSTRAP_RPMS)
$(BUILD_DIR)/bootstrap/prepare-initram-root.done: export yum_local_repo:=$(yum_local_repo)
$(BUILD_DIR)/bootstrap/prepare-initram-root.done: \
$(BUILD_DIR)/mirror/build.done

5
config.mk
View File

@@ -1,7 +1,4 @@
PWD:=$(shell pwd -P)
SOURCE_DIR:=$(PWD)
BUILD_DIR:=$(PWD)/build
COMMIT_SHA:=$(shell git rev-parse --verify HEAD)
CENTOS_MAJOR:=6
CENTOS_MINOR:=3

8
iso/module.mk
View File

@@ -49,7 +49,7 @@ $(BUILD_DIR)/iso/isoroot-files.done: \
$(ISOROOT)/ks.cfg \
$(ISOROOT)/bootstrap_admin_node.sh \
$(ISOROOT)/bootstrap_admin_node.conf \
$(ISOROOT)/version.yaml
$(ISOROOT)/version.yaml \
$(ISOROOT)/puppet-nailgun.tgz \
$(ISOROOT)/puppet-slave.tgz
$(ACTION.TOUCH)
@@ -60,9 +60,13 @@ $(ISOROOT)/isolinux/isolinux.cfg: $(SOURCE_DIR)/iso/isolinux/isolinux.cfg ; $(AC
$(ISOROOT)/ks.cfg: $(SOURCE_DIR)/iso/ks.cfg ; $(ACTION.COPY)
$(ISOROOT)/bootstrap_admin_node.sh: $(SOURCE_DIR)/iso/bootstrap_admin_node.sh ; $(ACTION.COPY)
$(ISOROOT)/bootstrap_admin_node.conf: $(SOURCE_DIR)/iso/bootstrap_admin_node.conf ; $(ACTION.COPY)
$(ISOROOT)/version.yaml: $(call depv,COMMIT_SHA)
$(ISOROOT)/version.yaml:
echo "COMMIT_SHA: $(COMMIT_SHA)" > $@
$(ISOROOT)/puppet-nailgun.tgz: \
$(call find-files,$(SOURCE_DIR)/puppet)
(cd puppet && tar chzf $@ *)
(cd $(SOURCE_DIR)/puppet && tar chzf $@ *)
$(ISOROOT)/puppet-slave.tgz: \
$(call find-files,$(SOURCE_DIR)/puppet/nailytest) \
$(call find-files,$(SOURCE_DIR)/puppet/osnailyfacter) \

7
mirror/eggs/module.mk
View File

@@ -1,10 +1,11 @@
$(BUILD_DIR)/mirror/eggs/build.done: $(call depv,LOCAL_MIRROR_EGGS)
$(BUILD_DIR)/mirror/eggs/build.done: $(call depv,REQUIRED_EGGS)
$(BUILD_DIR)/mirror/eggs/build.done: SANDBOX:=$(BUILD_DIR)/mirror/eggs/SANDBOX
$(BUILD_DIR)/mirror/eggs/build.done: export SANDBOX_UP:=$(SANDBOX_UP)
$(BUILD_DIR)/mirror/eggs/build.done: export SANDBOX_DOWN:=$(SANDBOX_DOWN)
$(BUILD_DIR)/mirror/eggs/build.done: \
$(BUILD_DIR)/mirror/centos/build.done \
$(SOURCE_DIR)/requirements-eggs.txt \
$(SOURCE_DIR)/config.mk
$(BUILD_DIR)/mirror/centos/build.done
mkdir -p $(@D)
sudo sh -c "$${SANDBOX_UP}"

5
mirror/gems/module.mk
View File

@@ -1,5 +1,5 @@
$(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile: \
$(SOURCE_DIR)/config.mk
$(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile: $(call depv,MIRROR_GEMS)
$(BUILD_DIR)/mirror/gems/gems-bundle/Gemfile:
mkdir -p $(@D)
echo -n > $@
for i in $(MIRROR_GEMS); do \
@@ -20,6 +20,7 @@ $(BUILD_DIR)/mirror/gems/gems-bundle.done: $(BUILD_DIR)/mirror/gems/gems-bundle-
( cd $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/ && gem fetch -v 1.2.1 bundler )
$(ACTION.TOUCH)
$(BUILD_DIR)/mirror/gems/build.done: $(call depv,LOCAL_MIRROR_GEMS)
$(BUILD_DIR)/mirror/gems/build.done: $(BUILD_DIR)/mirror/gems/gems-bundle.done
@mkdir -p $(LOCAL_MIRROR_GEMS)/gems
cp $(BUILD_DIR)/mirror/gems/gems-bundle/vendor/cache/*.gem $(LOCAL_MIRROR_GEMS)/gems