openstack
/
instack-undercloud
Code Issues Proposed changes

Update rdo-juno to use rdo-release element from tie and install correct version of python-ironicclient base on f20 or el7

This commit is contained in:
James Slagle 2014-10-23 10:29:53 -04:00
parent 6994ca2964
commit 4b44f04159
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
elements/rdo-juno/element-deps Normal file
View File

@ -0,0 +1 @@
rdo-release

1
elements/rdo-juno/environment.d/02-rdo-release.bash Normal file
View File

@ -0,0 +1 @@
export RDO_RELEASE=${RDO_RELEASE:-"juno"}

10
elements/rdo-juno/pre-install.d/01-rdo-juno
View File

@ -1,10 +0,0 @@
#!/bin/bash
set -eux
set -o pipefail
yum -y install $RDO_RELEASE_RPM
# Must install python-ironicclient from RDO stage until it is available in
# RDO.
yum -y install http://team.virt.bos.redhat.com/openstack/openstack-juno/fedora-20/python-ironicclient-0.3.1-1.fc22.noarch.rpm

13
elements/rdo-juno/pre-install.d/06-rdo-juno Executable file
View File

@ -0,0 +1,13 @@
#!/bin/bash
set -eux
set -o pipefail
# Must install python-ironicclient from RDO stage until it is available in
# RDO.
if rpm -q fedora-release; then
rpm -q python-ironicclient || yum -y install http://team.virt.bos.redhat.com/openstack/openstack-juno/fedora-20/python-ironicclient-0.3.1-1.fc22.noarch.rpm
else
rpm -q python-ironicclient || yum -y install http://team.virt.bos.redhat.com/openstack/openstack-juno/epel-7/python-ironicclient-0.3.1-1.el7.centos.noarch.rpm
fi