From 3839703dc5291487633f88611204f7992cd97def Mon Sep 17 00:00:00 2001 From: Vitaly Parakhin Date: Thu, 17 Mar 2016 17:04:51 +0200 Subject: [PATCH] Remove debian-installer placeholders In Fuel 7.0 we dropped classical provisioning mode, fully switching to IBP. Since then, placeholders created for Ubuntu cobbler profile, are no longer needed. Also, remove 'fuel' package dependency for the 'fuel-provisioning-scripts' which contains debian-installer download script. Related-Bug: #1549346 Change-Id: I36ff56c1e4a0437b33fc8e31da3df6f311607307 --- iso/bootstrap_admin_node.sh | 7 ------- specs/fuel-main.spec | 1 - 2 files changed, 8 deletions(-) diff --git a/iso/bootstrap_admin_node.sh b/iso/bootstrap_admin_node.sh index 86b006678..304497a00 100755 --- a/iso/bootstrap_admin_node.sh +++ b/iso/bootstrap_admin_node.sh @@ -241,13 +241,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 diff --git a/specs/fuel-main.spec b/specs/fuel-main.spec index 9c9f634a5..b85846c19 100644 --- a/specs/fuel-main.spec +++ b/specs/fuel-main.spec @@ -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}