openstack/devstack
Code Issues Proposed changes

Always install apache and proxy-uwsgi

Browse Source 
We're going to want to start using it by default so just start with
always installing it. This should not negatively impact anything else.

Also had to fix the test using cowsay, now that cowsay depends on
cowsay-off.

Part of uwsgi in devstack.

Change-Id: I8306a992d9d006bc0130a255145a6880065aa0df
This commit is contained in:
Sean Dague 2017-04-13 08:56:44 -04:00
parent 94047f45cd
commit 4da0fa8c13
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
files/debs/general
View File

@ -1,3 +1,5 @@
apache2
apache2-dev
bc bc
bridge-utils bridge-utils
bsdmainutils bsdmainutils
@ -9,6 +11,7 @@ gettext # used for compiling message catalogs
git git
graphviz # needed for docs graphviz # needed for docs
iputils-ping iputils-ping
libapache2-mod-proxy-uwsgi
libffi-dev # for pyOpenSSL libffi-dev # for pyOpenSSL
libjpeg-dev # Pillow 3.0.0 libjpeg-dev # Pillow 3.0.0
libmysqlclient-dev # MySQL-python libmysqlclient-dev # MySQL-python

2
files/rpms/general
View File

@ -7,6 +7,8 @@ gcc-c++
gettext # used for compiling message catalogs gettext # used for compiling message catalogs
git-core git-core
graphviz # needed only for docs graphviz # needed only for docs
httpd
httpd-devel
iptables-services # NOPRIME f23,f24,f25 iptables-services # NOPRIME f23,f24,f25
java-1.7.0-openjdk-headless # NOPRIME rhel7 java-1.7.0-openjdk-headless # NOPRIME rhel7
java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25 java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25

2
tests/test_functions.sh
View File

@ -224,7 +224,7 @@ fi
# test against removed package...was a bug on Ubuntu # test against removed package...was a bug on Ubuntu
if is_ubuntu; then if is_ubuntu; then
PKG=cowsay PKG=cowsay-off
if ! (dpkg -s $PKG >/dev/null 2>&1); then if ! (dpkg -s $PKG >/dev/null 2>&1); then
# it was never installed...set up the condition # it was never installed...set up the condition
sudo apt-get install -y cowsay >/dev/null 2>&1 sudo apt-get install -y cowsay >/dev/null 2>&1