openstack/devstack
Code Issues Proposed changes

Merge "Initial support for Fedora 21"

Browse Source
This commit is contained in:
Jenkins 2014-11-16 17:32:18 +00:00 committed by Gerrit Code Review
commit 4c6ceb56cf
9 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/rpms/cinder
View File

@ -3,4 +3,4 @@ scsi-target-utils
qemu-img qemu-img
postgresql-devel postgresql-devel
iscsi-initiator-utils iscsi-initiator-utils
python-lxml #dist:f19,f20,rhel7 python-lxml #dist:f19,f20,f21,rhel7

6
files/rpms/glance
View File

@ -6,10 +6,10 @@ postgresql-devel # testonly
python-argparse python-argparse
python-eventlet python-eventlet
python-greenlet python-greenlet
python-lxml #dist:f19,f20,rhel7 python-lxml #dist:f19,f20,f21,rhel7
python-paste-deploy #dist:f19,f20,rhel7 python-paste-deploy #dist:f19,f20,f21,rhel7
python-routes python-routes
python-sqlalchemy python-sqlalchemy
python-wsgiref #dist:f18,f19,f20 python-wsgiref #dist:f18,f19,f20,f21
pyxattr pyxattr
zlib-devel # testonly zlib-devel # testonly

4
files/rpms/horizon
View File

@ -12,8 +12,8 @@ python-httplib2
python-migrate python-migrate
python-mox python-mox
python-nose python-nose
python-paste #dist:f19,f20 python-paste #dist:f19,f20,f21
python-paste-deploy #dist:f19,f20 python-paste-deploy #dist:f19,f20,f21
python-routes python-routes
python-sphinx python-sphinx
python-sqlalchemy python-sqlalchemy

10
files/rpms/keystone
View File

@ -1,10 +1,10 @@
MySQL-python MySQL-python
python-greenlet python-greenlet
libxslt-devel # dist:f20 libxslt-devel # dist:f20,f21
python-lxml #dist:f19,f20 python-lxml #dist:f19,f20,f21
python-paste #dist:f19,f20 python-paste #dist:f19,f20,f21
python-paste-deploy #dist:f19,f20 python-paste-deploy #dist:f19,f20,f21
python-paste-script #dist:f19,f20 python-paste-script #dist:f19,f20,f21
python-routes python-routes
python-sqlalchemy python-sqlalchemy
python-webob python-webob

4
files/rpms/neutron
View File

@ -12,8 +12,8 @@ python-eventlet
python-greenlet python-greenlet
python-iso8601 python-iso8601
#rhel6 gets via pip #rhel6 gets via pip
python-paste # dist:f19,f20,rhel7 python-paste # dist:f19,f20,f21,rhel7
python-paste-deploy # dist:f19,f20,rhel7 python-paste-deploy # dist:f19,f20,f21,rhel7
python-qpid # NOPRIME python-qpid # NOPRIME
python-routes python-routes
python-sqlalchemy python-sqlalchemy

6
files/rpms/nova
View File

@ -29,11 +29,11 @@ python-iso8601
python-lockfile python-lockfile
python-migrate python-migrate
python-mox python-mox
python-paramiko # dist:f19,f20,rhel7 python-paramiko # dist:f19,f20,f21,rhel7
# ^ on RHEL6, brings in python-crypto which conflicts with version from # ^ on RHEL6, brings in python-crypto which conflicts with version from
# pip we need # pip we need
python-paste # dist:f19,f20,rhel7 python-paste # dist:f19,f20,f21,rhel7
python-paste-deploy # dist:f19,f20,rhel7 python-paste-deploy # dist:f19,f20,f21,rhel7
python-qpid # NOPRIME python-qpid # NOPRIME
python-routes python-routes
python-sqlalchemy python-sqlalchemy

2
files/rpms/swift
View File

@ -6,7 +6,7 @@ python-eventlet
python-greenlet python-greenlet
python-netifaces python-netifaces
python-nose python-nose
python-paste-deploy # dist:f19,f20,rhel7 python-paste-deploy # dist:f19,f20,f21,rhel7
python-simplejson python-simplejson
python-webob python-webob
pyxattr pyxattr

18
lib/databases/mysql
View File

@ -26,10 +26,10 @@ function cleanup_database_mysql {
sudo rm -rf /etc/mysql sudo rm -rf /etc/mysql
return return
elif is_fedora; then elif is_fedora; then
if [[ $DISTRO =~ (rhel7) ]]; then if [[ $DISTRO =~ (rhel6) ]]; then
MYSQL=mariadb
else
MYSQL=mysqld MYSQL=mysqld
else
MYSQL=mariadb
fi fi
elif is_suse; then elif is_suse; then
MYSQL=mysql MYSQL=mysql
@ -54,10 +54,10 @@ function configure_database_mysql {
my_conf=/etc/mysql/my.cnf my_conf=/etc/mysql/my.cnf
mysql=mysql mysql=mysql
elif is_fedora; then elif is_fedora; then
if [[ $DISTRO =~ (rhel7) ]]; then if [[ $DISTRO =~ (rhel6) ]]; then
mysql=mariadb
else
mysql=mysqld mysql=mysqld
else
mysql=mariadb
fi fi
my_conf=/etc/my.cnf my_conf=/etc/my.cnf
elif is_suse; then elif is_suse; then
@ -142,10 +142,10 @@ EOF
fi fi
# Install mysql-server # Install mysql-server
if is_ubuntu || is_fedora; then if is_ubuntu || is_fedora; then
if [[ $DISTRO =~ (rhel7) ]]; then if [[ $DISTRO =~ (rhel6) ]]; then
install_package mariadb-server
else
install_package mysql-server install_package mysql-server
else
install_package mariadb-server
fi fi
elif is_suse; then elif is_suse; then
if ! is_package_installed mariadb; then if ! is_package_installed mariadb; then

2
stack.sh
View File

@ -143,7 +143,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|f19|f20|rhel6|rhel7) ]]; then if [[ ! ${DISTRO} =~ (precise|trusty|7.0|wheezy|sid|testing|jessie|f19|f20|f21|rhel6|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"