Skip to content

Commit 4c6ceb5

Browse files
Jenkinsopenstack-gerrit
Jenkins
authored and
openstack-gerrit
committed
Merge "Initial support for Fedora 21"
2 parents b767463 + 6d20f09 commit 4c6ceb5

9 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎files/rpms/cinder‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ scsi-target-utils
33
qemu-img
44
postgresql-devel
55
iscsi-initiator-utils
6-
python-lxml #dist:f19,f20,rhel7
6+
python-lxml #dist:f19,f20,f21,rhel7

‎files/rpms/glance‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@ postgresql-devel # testonly
66
python-argparse
77
python-eventlet
88
python-greenlet
9-
python-lxml #dist:f19,f20,rhel7
10-
python-paste-deploy #dist:f19,f20,rhel7
9+
python-lxml #dist:f19,f20,f21,rhel7
10+
python-paste-deploy #dist:f19,f20,f21,rhel7
1111
python-routes
1212
python-sqlalchemy
13-
python-wsgiref #dist:f18,f19,f20
13+
python-wsgiref #dist:f18,f19,f20,f21
1414
pyxattr
1515
zlib-devel # testonly

‎files/rpms/horizon‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ python-httplib2
1212
python-migrate
1313
python-mox
1414
python-nose
15-
python-paste #dist:f19,f20
16-
python-paste-deploy #dist:f19,f20
15+
python-paste #dist:f19,f20,f21
16+
python-paste-deploy #dist:f19,f20,f21
1717
python-routes
1818
python-sphinx
1919
python-sqlalchemy

‎files/rpms/keystone‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
MySQL-python
22
python-greenlet
3-
libxslt-devel # dist:f20
4-
python-lxml #dist:f19,f20
5-
python-paste #dist:f19,f20
6-
python-paste-deploy #dist:f19,f20
7-
python-paste-script #dist:f19,f20
3+
libxslt-devel # dist:f20,f21
4+
python-lxml #dist:f19,f20,f21
5+
python-paste #dist:f19,f20,f21
6+
python-paste-deploy #dist:f19,f20,f21
7+
python-paste-script #dist:f19,f20,f21
88
python-routes
99
python-sqlalchemy
1010
python-webob

‎files/rpms/neutron‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ python-eventlet
1212
python-greenlet
1313
python-iso8601
1414
#rhel6 gets via pip
15-
python-paste # dist:f19,f20,rhel7
16-
python-paste-deploy # dist:f19,f20,rhel7
15+
python-paste # dist:f19,f20,f21,rhel7
16+
python-paste-deploy # dist:f19,f20,f21,rhel7
1717
python-qpid # NOPRIME
1818
python-routes
1919
python-sqlalchemy

‎files/rpms/nova‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ python-iso8601
2929
python-lockfile
3030
python-migrate
3131
python-mox
32-
python-paramiko # dist:f19,f20,rhel7
32+
python-paramiko # dist:f19,f20,f21,rhel7
3333
# ^ on RHEL6, brings in python-crypto which conflicts with version from
3434
# pip we need
35-
python-paste # dist:f19,f20,rhel7
36-
python-paste-deploy # dist:f19,f20,rhel7
35+
python-paste # dist:f19,f20,f21,rhel7
36+
python-paste-deploy # dist:f19,f20,f21,rhel7
3737
python-qpid # NOPRIME
3838
python-routes
3939
python-sqlalchemy

‎files/rpms/swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ python-eventlet
66
python-greenlet
77
python-netifaces
88
python-nose
9-
python-paste-deploy # dist:f19,f20,rhel7
9+
python-paste-deploy # dist:f19,f20,f21,rhel7
1010
python-simplejson
1111
python-webob
1212
pyxattr

‎lib/databases/mysql‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ function cleanup_database_mysql {
2626
sudo rm -rf /etc/mysql
2727
return
2828
elif is_fedora; then
29-
if [[ $DISTRO =~ (rhel7) ]]; then
30-
MYSQL=mariadb
31-
else
29+
if [[ $DISTRO =~ (rhel6) ]]; then
3230
MYSQL=mysqld
31+
else
32+
MYSQL=mariadb
3333
fi
3434
elif is_suse; then
3535
MYSQL=mysql
@@ -54,10 +54,10 @@ function configure_database_mysql {
5454
my_conf=/etc/mysql/my.cnf
5555
mysql=mysql
5656
elif is_fedora; then
57-
if [[ $DISTRO =~ (rhel7) ]]; then
58-
mysql=mariadb
59-
else
57+
if [[ $DISTRO =~ (rhel6) ]]; then
6058
mysql=mysqld
59+
else
60+
mysql=mariadb
6161
fi
6262
my_conf=/etc/my.cnf
6363
elif is_suse; then
@@ -142,10 +142,10 @@ EOF
142142
fi
143143
# Install mysql-server
144144
if is_ubuntu || is_fedora; then
145-
if [[ $DISTRO =~ (rhel7) ]]; then
146-
install_package mariadb-server
147-
else
145+
if [[ $DISTRO =~ (rhel6) ]]; then
148146
install_package mysql-server
147+
else
148+
install_package mariadb-server
149149
fi
150150
elif is_suse; then
151151
if ! is_package_installed mariadb; then

‎stack.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ source $TOP_DIR/stackrc
143143

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

0 commit comments

Comments
 (0)