openstack/devstack
Code Issues Proposed changes

Merge "Enable F22 without the FORCE flag"

Browse Source
This commit is contained in:
Jenkins 2015-05-29 00:05:01 +00:00 committed by Gerrit Code Review
commit 493d3b3aff
3 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/rpms/devlibs
View File

@ -1,8 +1,7 @@
libffi-devel # pyOpenSSL libffi-devel # pyOpenSSL
libxml2-devel # lxml libxml2-devel # lxml
libxslt-devel # lxml libxslt-devel # lxml
mariadb-devel # MySQL-python f20,f21,rhel7 mariadb-devel # MySQL-python
mysql-devel # MySQL-python rhel6
openssl-devel # pyOpenSSL openssl-devel # pyOpenSSL
postgresql-devel # psycopg2 postgresql-devel # psycopg2
python-devel # pyOpenSSL python-devel # pyOpenSSL

2
lib/ceph
View File

@ -110,7 +110,7 @@ function undefine_virsh_secret {
# check_os_support_ceph() - Check if the operating system provides a decent version of Ceph # check_os_support_ceph() - Check if the operating system provides a decent version of Ceph
function check_os_support_ceph { function check_os_support_ceph {
if [[ ! ${DISTRO} =~ (trusty|f20|f21) ]]; then if [[ ! ${DISTRO} =~ (trusty|f20|f21|f22) ]]; then
echo "WARNING: your distro $DISTRO does not provide (at least) the Firefly release. Please use Ubuntu Trusty or Fedora 20 (and higher)" echo "WARNING: your distro $DISTRO does not provide (at least) the Firefly release. Please use Ubuntu Trusty or Fedora 20 (and higher)"
if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then if [[ "$FORCE_CEPH_INSTALL" != "yes" ]]; then
die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes" die $LINENO "If you wish to install Ceph on this distribution anyway run with FORCE_CEPH_INSTALL=yes"

2
stack.sh
View File

@ -173,7 +173,7 @@ source $TOP_DIR/stackrc
# Warn users who aren't on an explicitly supported distro, but allow them to # Warn users who aren't on an explicitly supported distro, but allow them to
# override check and attempt installation with ``FORCE=yes ./stack`` # override check and attempt installation with ``FORCE=yes ./stack``
if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|rhel7) ]]; then if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f20|f21|f22|rhel7) ]]; then
echo "WARNING: this script has not been tested on $DISTRO" echo "WARNING: this script has not been tested on $DISTRO"
if [[ "$FORCE" != "yes" ]]; then if [[ "$FORCE" != "yes" ]]; then
die $LINENO "If you wish to run this script anyway run with FORCE=yes" die $LINENO "If you wish to run this script anyway run with FORCE=yes"