Browse code
Always install apache and proxy-uwsgi
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
Sean Dague authored on 2017/04/13 21:56:44Showing 3 changed files
| ... | ... |
@@ -1,3 +1,5 @@ |
| 1 |
+apache2 |
|
| 2 |
+apache2-dev |
|
| 1 | 3 |
bc |
| 2 | 4 |
bridge-utils |
| 3 | 5 |
bsdmainutils |
| ... | ... |
@@ -9,6 +11,7 @@ gettext # used for compiling message catalogs |
| 9 | 9 |
git |
| 10 | 10 |
graphviz # needed for docs |
| 11 | 11 |
iputils-ping |
| 12 |
+libapache2-mod-proxy-uwsgi |
|
| 12 | 13 |
libffi-dev # for pyOpenSSL |
| 13 | 14 |
libjpeg-dev # Pillow 3.0.0 |
| 14 | 15 |
libmysqlclient-dev # MySQL-python |
| ... | ... |
@@ -7,6 +7,8 @@ gcc-c++ |
| 7 | 7 |
gettext # used for compiling message catalogs |
| 8 | 8 |
git-core |
| 9 | 9 |
graphviz # needed only for docs |
| 10 |
+httpd |
|
| 11 |
+httpd-devel |
|
| 10 | 12 |
iptables-services # NOPRIME f23,f24,f25 |
| 11 | 13 |
java-1.7.0-openjdk-headless # NOPRIME rhel7 |
| 12 | 14 |
java-1.8.0-openjdk-headless # NOPRIME f23,f24,f25 |
| ... | ... |
@@ -224,7 +224,7 @@ fi |
| 224 | 224 |
|
| 225 | 225 |
# test against removed package...was a bug on Ubuntu |
| 226 | 226 |
if is_ubuntu; then |
| 227 |
- PKG=cowsay |
|
| 227 |
+ PKG=cowsay-off |
|
| 228 | 228 |
if ! (dpkg -s $PKG >/dev/null 2>&1); then |
| 229 | 229 |
# it was never installed...set up the condition |
| 230 | 230 |
sudo apt-get install -y cowsay >/dev/null 2>&1 |