openstack
/
fuel-main
Code Issues Proposed changes

Merge "Remove debian-installer placeholders"

This commit is contained in:
Jenkins 2016-04-21 13:45:48 +00:00 committed by Gerrit Code Review
parent 9ab29a11a6 3839703dc5
commit 7c04102f8e
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
iso/bootstrap_admin_node.sh
View File

@ -237,13 +237,6 @@ echo $FUEL_PACKAGES | xargs -n1 yum install -y
# /etc/fuel_openstack_version is provided by 'fuel-openstack-metadata' package
OPENSTACK_VERSION=$(cat /etc/fuel_openstack_version)
# We do not ship debian-installer kernel and initrd on ISO.
# But we still need to be able to create ubuntu cobbler distro
# which requires kernel and initrd to be available. So, we
# just touch these files to work around cobbler's limitation.
mkdir -p ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/images/
touch ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/images/linux
touch ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/images/initrd.gz
touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml

1
specs/fuel-main.spec
View File

@ -18,7 +18,6 @@ Prefix: %{_prefix}
BuildArch: noarch
Requires: fuel-library10.0
Requires: fuelmenu >= %{version}
Requires: fuel-provisioning-scripts >= %{version}
Requires: fuel-release >= %{version}
Requires: network-checker >= %{version}
Requires: python-fuelclient >= %{version}