Put upgrade tarball in lrzip archive
New build target: upgrade-lrzip Command line for extract: lrzuntar fuel-master-upgrade.tar.lrz Change-Id: Ie23263cc3bdc27acdee5ba6858f1ee282d414277 Closes-Bug: #1356813 Blueprint: upgrade-lrzip
This commit is contained in:
parent
3c7a8aa6e3
commit
ef7b906832
|
@ -44,7 +44,6 @@ OPENSTACK_PATCH_TARBALL_NAME?=fuel-$(PRODUCT_VERSION)-patch
|
||||||
ISO_PATH:=$(ARTS_DIR)/$(ISO_NAME).iso
|
ISO_PATH:=$(ARTS_DIR)/$(ISO_NAME).iso
|
||||||
IMG_PATH:=$(ARTS_DIR)/$(ISO_NAME).img
|
IMG_PATH:=$(ARTS_DIR)/$(ISO_NAME).img
|
||||||
UPGRADE_TARBALL_PATH:=$(ARTS_DIR)/$(UPGRADE_TARBALL_NAME).tar
|
UPGRADE_TARBALL_PATH:=$(ARTS_DIR)/$(UPGRADE_TARBALL_NAME).tar
|
||||||
OPENSTACK_PATCH_TARBALL_PATH:=$(ARTS_DIR)/$(OPENSTACK_PATCH_TARBALL_NAME).tar
|
|
||||||
|
|
||||||
MASTER_IP?=10.20.0.2
|
MASTER_IP?=10.20.0.2
|
||||||
MASTER_DNS?=10.20.0.1
|
MASTER_DNS?=10.20.0.1
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
.PHONY: all upgrade openstack-patch openstack-yaml
|
.PHONY: all upgrade openstack-patch openstack-yaml
|
||||||
.DELETE_ON_ERROR: $(UPGRADE_TARBALL_PATH)
|
.DELETE_ON_ERROR: $(UPGRADE_TARBALL_PATH)
|
||||||
.DELETE_ON_ERROR: $(OPENSTACK_PATCH_TARBALL_PATH)
|
.DELETE_ON_ERROR: $(UPGRADE_TARBALL_PATH).lrz
|
||||||
.DELETE_ON_ERROR: $(BUILD_DIR)/upgrade/common-part.tar
|
.DELETE_ON_ERROR: $(BUILD_DIR)/upgrade/common-part.tar
|
||||||
.DELETE_ON_ERROR: $(BUILD_DIR)/upgrade/fuel-part.tar
|
.DELETE_ON_ERROR: $(BUILD_DIR)/upgrade/fuel-part.tar
|
||||||
.DELETE_ON_ERROR: $(BUILD_DIR)/upgrade/openstack-part.tar
|
.DELETE_ON_ERROR: $(BUILD_DIR)/upgrade/openstack-part.tar
|
||||||
|
@ -10,8 +10,8 @@ all: upgrade openstack-yaml
|
||||||
upgrade: UPGRADERS ?= "host-system docker bootstrap openstack"
|
upgrade: UPGRADERS ?= "host-system docker bootstrap openstack"
|
||||||
upgrade: $(UPGRADE_TARBALL_PATH)
|
upgrade: $(UPGRADE_TARBALL_PATH)
|
||||||
|
|
||||||
openstack-patch: UPGRADERS ?= "openstack"
|
upgrade-lrzip: UPGRADERS ?= "host-system docker bootstrap openstack"
|
||||||
openstack-patch: $(OPENSTACK_PATCH_TARBALL_PATH)
|
upgrade-lrzip: $(UPGRADE_TARBALL_PATH).lrz
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# UPGRADE ARTIFACT
|
# UPGRADE ARTIFACT
|
||||||
|
@ -26,14 +26,18 @@ $(UPGRADE_TARBALL_PATH): \
|
||||||
tar Af $@ $(BUILD_DIR)/upgrade/common-part.tar
|
tar Af $@ $(BUILD_DIR)/upgrade/common-part.tar
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# OPENSTACK_PATCH ARTIFACT
|
# UPGRADE LRZIP ARTIFACT
|
||||||
########################
|
########################
|
||||||
$(OPENSTACK_PATCH_TARBALL_PATH): \
|
$(UPGRADE_TARBALL_PATH).lrz: \
|
||||||
$(BUILD_DIR)/upgrade/common-part.tar \
|
$(BUILD_DIR)/upgrade/openstack-part.tar \
|
||||||
$(BUILD_DIR)/upgrade/openstack-part.tar
|
$(BUILD_DIR)/upgrade/fuel-lrzip-part.tar \
|
||||||
|
$(BUILD_DIR)/upgrade/common-part.tar
|
||||||
mkdir -p $(@D)
|
mkdir -p $(@D)
|
||||||
tar Af $@ $(BUILD_DIR)/upgrade/openstack-part.tar
|
rm -f $(BUILD_DIR)/upgrade/upgrade-lrzip.tar
|
||||||
tar Af $@ $(BUILD_DIR)/upgrade/common-part.tar
|
tar Af $(BUILD_DIR)/upgrade/upgrade-lrzip.tar $(BUILD_DIR)/upgrade/fuel-lrzip-part.tar
|
||||||
|
tar Af $(BUILD_DIR)/upgrade/upgrade-lrzip.tar $(BUILD_DIR)/upgrade/openstack-part.tar
|
||||||
|
tar Af $(BUILD_DIR)/upgrade/upgrade-lrzip.tar $(BUILD_DIR)/upgrade/common-part.tar
|
||||||
|
lrzip -L2 -U -D -f $(BUILD_DIR)/upgrade/upgrade-lrzip.tar -o $@
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# OPENSTACK_YAML ARTIFACT
|
# OPENSTACK_YAML ARTIFACT
|
||||||
|
@ -87,6 +91,21 @@ $(BUILD_DIR)/upgrade/fuel-part.tar: \
|
||||||
tar rf $@ -C $(BUILD_DIR)/iso/isoroot --xform s:^:upgrade/config/: version.yaml
|
tar rf $@ -C $(BUILD_DIR)/iso/isoroot --xform s:^:upgrade/config/: version.yaml
|
||||||
tar rf $@ -C $(BUILD_DIR)/bootstrap --xform s:^:upgrade/bootstrap/: initramfs.img linux
|
tar rf $@ -C $(BUILD_DIR)/bootstrap --xform s:^:upgrade/bootstrap/: initramfs.img linux
|
||||||
|
|
||||||
|
########################
|
||||||
|
# FUEL LRZIP PART
|
||||||
|
########################
|
||||||
|
$(BUILD_DIR)/upgrade/fuel-lrzip-part.tar: \
|
||||||
|
$(BUILD_DIR)/bootstrap/build.done \
|
||||||
|
$(ISOROOT)/version.yaml \
|
||||||
|
$(BUILD_DIR)/docker/fuel-images.tar.lrz
|
||||||
|
mkdir -p $(@D)
|
||||||
|
rm -f $@
|
||||||
|
mkdir -p $(BUILD_DIR)/upgrade/images
|
||||||
|
cd $(BUILD_DIR)/upgrade/images && lrzuntar -f $(BUILD_DIR)/docker/fuel-images.tar.lrz
|
||||||
|
tar cf $@ -C $(BUILD_DIR) upgrade/images
|
||||||
|
tar rf $@ -C $(BUILD_DIR)/iso/isoroot --xform s:^:upgrade/config/: version.yaml
|
||||||
|
tar rf $@ -C $(BUILD_DIR)/bootstrap --xform s:^:upgrade/bootstrap/: initramfs.img linux
|
||||||
|
|
||||||
########################
|
########################
|
||||||
# OPENSTACK PART
|
# OPENSTACK PART
|
||||||
########################
|
########################
|
||||||
|
|
|
@ -20,15 +20,17 @@ function prepare_upgrade_files {
|
||||||
DOCKER_IMAGES_DIR_PATH=$UPGRADE_PATH/images
|
DOCKER_IMAGES_DIR_PATH=$UPGRADE_PATH/images
|
||||||
DOCKER_IMAGES_ARCHIVE_PATH=$DOCKER_IMAGES_DIR_PATH/fuel-images.tar.lrz
|
DOCKER_IMAGES_ARCHIVE_PATH=$DOCKER_IMAGES_DIR_PATH/fuel-images.tar.lrz
|
||||||
|
|
||||||
pushd $DOCKER_IMAGES_DIR_PATH >> /dev/null
|
if [ -r $DOCKER_IMAGES_ARCHIVE_PATH ]; then
|
||||||
|
pushd $DOCKER_IMAGES_DIR_PATH >> /dev/null
|
||||||
|
|
||||||
local err_msg="Failed to uncompress docker "\
|
local err_msg="Failed to uncompress docker "\
|
||||||
"images ${DOCKER_IMAGES_ARCHIVE_PATH}, check "\
|
"images ${DOCKER_IMAGES_ARCHIVE_PATH}, check "\
|
||||||
"if you have enough free space"
|
"if you have enough free space"
|
||||||
|
|
||||||
lrzuntar -f $DOCKER_IMAGES_ARCHIVE_PATH || error "$err_msg"
|
lrzuntar -f $DOCKER_IMAGES_ARCHIVE_PATH || error "$err_msg"
|
||||||
|
|
||||||
popd >> /dev/null
|
popd >> /dev/null
|
||||||
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue