openstack
/
fuel-main
Code Issues Proposed changes

Merge "Fix typos in Fuel files"

This commit is contained in:
Jenkins 2016-03-29 13:41:34 +00:00 committed by Gerrit Code Review
parent 2621cd4357 735eef25ec
commit 73bd5d9a64
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config.mk
View File

@ -220,7 +220,7 @@ SANDBOX_COPY_CERTS?=0
# Please don’t change them if you don’t know what they do ##
# Work-around for: LP1482667
# If not empty, will try to download prepeared upstream puppet modules source,
# If not empty, will try to download prepared upstream puppet modules source,
# which used like requirements for build fuel-library package.
# List of modules, which SHOULD be passed via this file can be found:
# https://github.com/openstack/fuel-library/blob/master/deployment/Puppetfile

2
iso/bootstrap_admin_node.sh
View File

@ -314,7 +314,7 @@ https://docs.mirantis.com/openstack/fuel/fuel-7.0/reference-architecture.html#fu
EOF
# Generete Fuel UUID
# Generate Fuel UUID
[ ! -f "/etc/fuel/fuel-uuid" ] && uuidgen > /etc/fuel/fuel-uuid || :
# Prepare custom /etc/issue logon banner and script for changing IP in it

2
iso/module.mk
View File

@ -143,7 +143,7 @@ $(ISO_PATH): $(BUILD_DIR)/iso/isoroot.done
sudo umount -l $(BUILD_DIR)/iso/efi_tmp/efi_image || true
sudo mount $(BUILD_DIR)/iso/efi_tmp/efiboot.img $(BUILD_DIR)/iso/efi_tmp/efi_image
# This needs to be edited in place due to some strange implemntations of UEFI
# This needs to be edited in place due to some strange implementations of UEFI
# For example, Tianocore OVMF will not use efiboot.img. Instead, it looks for
# bootloader and it conffiles in /EFI/BOOT/* on main ISO partition (with ISO9660 fs)
echo > $(BUILD_DIR)/iso/isoroot-mkisofs/EFI/BOOT/BOOTX64.conf

2
mirror/centos/repo.mk
View File

@ -67,7 +67,7 @@ $(BUILD_DIR)/mirror/centos/rpm-download.done: $(BUILD_DIR)/mirror/centos/urls.li
xargs -n1 -P4 wget -Nnv -P "$$dst" < $<
$(ACTION.TOUCH)
# BUILD_PACKAGES=0 - apply patch for requiremetns rpm, since we need fuel-packages
# BUILD_PACKAGES=0 - apply patch for requirements rpm, since we need fuel-packages
ifeq ($(BUILD_PACKAGES),0)
$(BUILD_DIR)/requirements-rpm.txt: \
$(SOURCE_DIR)/requirements-rpm.txt \