1. devstack
  2. Commit 5d7c7ac42556e03960a5a6549c3e07c34d36b9c0
Browse code

Merge "Add RHEL7 beta support"

Jenkins authored on 2014/02/24 12:19:27
Showing 6 changed files
files/rpms/cinder
History View file @ 5d7c7ac
... ... 
@@ -4,4 +4,4 @@ qemu-img
4 4 
 python-devel
5 5 
 postgresql-devel
6 6 
 iscsi-initiator-utils
7 
-python-lxml         #dist:f18,f19,f20
7 
+python-lxml         #dist:f18,f19,f20,rhel7
files/rpms/glance
History View file @ 5d7c7ac
... ... 
@@ -9,8 +9,8 @@ python-argparse
9 9 
 python-devel
10 10 
 python-eventlet
11 11 
 python-greenlet
12 
-python-lxml         #dist:f18,f19,f20
13 
-python-paste-deploy #dist:f18,f19,f20
12 
+python-lxml         #dist:f18,f19,f20,rhel7
13 
+python-paste-deploy #dist:f18,f19,f20,rhel7
14 14 
 python-routes
15 15 
 python-sqlalchemy
16 16 
 python-wsgiref
files/rpms/neutron
History View file @ 5d7c7ac
... ... 
@@ -11,8 +11,8 @@ python-greenlet
11 11 
 python-iso8601
12 12 
 python-kombu
13 13 
 #rhel6 gets via pip
14 
-python-paste        # dist:f18,f19,f20
15 
-python-paste-deploy # dist:f18,f19,f20
14 
+python-paste        # dist:f18,f19,f20,rhel7
15 
+python-paste-deploy # dist:f18,f19,f20,rhel7
16 16 
 python-qpid
17 17 
 python-routes
18 18 
 python-sqlalchemy
files/rpms/nova
History View file @ 5d7c7ac
... ... 
@@ -28,11 +28,11 @@ python-kombu
28 28 
 python-lockfile
29 29 
 python-migrate
30 30 
 python-mox
31 
-python-paramiko # dist:f18,f19,f20
32 
-# ^ on RHEL, brings in python-crypto which conflicts with version from
31 
+python-paramiko # dist:f18,f19,f20,rhel7
32 
+# ^ on RHEL6, brings in python-crypto which conflicts with version from
33 33 
 # pip we need
34 
-python-paste        # dist:f18,f19,f20
35 
-python-paste-deploy # dist:f18,f19,f20
34 
+python-paste        # dist:f18,f19,f20,rhel7
35 
+python-paste-deploy # dist:f18,f19,f20,rhel7
36 36 
 python-qpid
37 37 
 python-routes
38 38 
 python-sqlalchemy
files/rpms/swift
History View file @ 5d7c7ac
... ... 
@@ -9,7 +9,7 @@ python-eventlet
9 9 
 python-greenlet
10 10 
 python-netifaces
11 11 
 python-nose
12 
-python-paste-deploy # dist:f18,f19,f20
12 
+python-paste-deploy # dist:f18,f19,f20,rhel7
13 13 
 python-simplejson
14 14 
 python-webob
15 15 
 pyxattr
lib/databases/mysql
History View file @ 5d7c7ac
... ... 
@@ -25,7 +25,11 @@ function cleanup_database_mysql {
25 25 
         sudo rm -rf /var/lib/mysql
26 26 
         return
27 27 
     elif is_fedora; then
28 
-        MYSQL=mysqld
28 
+        if [[ $DISTRO =~ (rhel7) ]]; then
29 
+            MYSQL=mariadb
30 
+        else
31 
+            MYSQL=mysqld
32 
+        fi
29 33 
     elif is_suse; then
30 34 
         MYSQL=mysql
31 35 
     else
... ... 
@@ -48,8 +52,12 @@ function configure_database_mysql {
48 48 
         MY_CONF=/etc/mysql/my.cnf
49 49 
         MYSQL=mysql
50 50 
     elif is_fedora; then
51 
+        if [[ $DISTRO =~ (rhel7) ]]; then
52 
+            MYSQL=mariadb
53 
+        else
54 
+            MYSQL=mysqld
55 
+        fi
51 56 
         MY_CONF=/etc/my.cnf
52 
-        MYSQL=mysqld
53 57 
     elif is_suse; then
54 58 
         MY_CONF=/etc/my.cnf
55 59 
         MYSQL=mysql
... ... 
@@ -135,7 +143,11 @@ EOF
135 135 
     fi
136 136 
     # Install mysql-server
137 137 
     if is_ubuntu || is_fedora; then
138 
-        install_package mysql-server
138 
+        if [[ $DISTRO =~ (rhel7) ]]; then
139 
+            install_package mariadb-server
140 
+        else
141 
+            install_package mysql-server
142 
+        fi
139 143 
     elif is_suse; then
140 144 
         if ! is_package_installed mariadb; then
141 145 
             install_package mysql-community-server