openstack
/
fuel-main
Code Issues Proposed changes

Explicitly set fuel-library version to PRODUCT_VERSION 

This works around a case where fuel-library has multiple
versions available, but we only want to ensure that the
version PRODUCT_VERSION is installed by anaconda.

Change-Id: I2681123ec508d11d90264f914fa25a68b6e5e7bb
Closes-Bug: #1509313
This commit is contained in:
Matthew Mosesohn 2015-10-27 13:44:09 +03:00
parent 69325fed8c
commit 29ddb1e4a7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
iso/ks.template
View File

@ -240,7 +240,7 @@ echo "cat /tmp/grub.script | chroot /mnt/sysimage /sbin/grub --no-floppy --batch
%packages --nobase --excludedocs
@Core
fuel
fuel-library
fuel-library >= {{PRODUCT_VERSION}}
fuel-dockerctl
authconfig
bind-utils

2
iso/module.mk
View File

@ -158,7 +158,7 @@ $(ISOROOT)/ks.cfg: $(SOURCE_DIR)/iso/ks.template $(SOURCE_DIR)/iso/ks.py $(KSYAM
python $(SOURCE_DIR)/iso/ks.py \
-t $(SOURCE_DIR)/iso/ks.template \
-c $(KSYAML) \
-u '{"CENTOS_RELEASE": "$(CENTOS_RELEASE)"}' \
-u '{"CENTOS_RELEASE": "$(CENTOS_RELEASE)", "PRODUCT_VERSION": "$(PRODUCT_VERSION)"}' \
-o $@.tmp
mv $@.tmp $@