openstack
/
fuel-main
Code Issues Proposed changes

Merge "Install fuel-openstack-metadata before getting OPENSTACK_VERSION"

This commit is contained in:
Jenkins 2016-03-02 14:48:26 +00:00 committed by Gerrit Code Review
parent ebab0180b3 b4a66463a7
commit 1867de9d2f
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
iso/bootstrap_admin_node.sh
View File

@ -222,6 +222,7 @@ yum makecache
echo $BOOTSTRAP_PACKAGES | xargs -n1 yum install -y
# /etc/fuel_release is provided by 'fuel-release' package
FUEL_RELEASE=$(cat /etc/fuel_release)
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)
@ -236,8 +237,6 @@ touch ${wwwdir}/${OPENSTACK_VERSION}/ubuntu/x86_64/images/initrd.gz
# Disable online base MOS repo if we run an ISO installation
[ -f /etc/fuel_build_id ] && yum-config-manager --disable mos${FUEL_RELEASE}-base --save
echo $FUEL_PACKAGES | xargs -n1 yum install -y
touch /var/lib/hiera/common.yaml /etc/puppet/hiera.yaml
# Be sure, that network devices have been initialized