E) Add support for Fedora 16
Highlights:
* Add files/rpms/*
* get_packages() only loads deps for services that are enabled
11Apr2012
* change mod_wsgi cwd to $HORIZON_DIR
* fix horizon apache log file name and location
Note: This superceeds https://review.openstack.org/4364
Change-Id: I95486584561e4418907a6a4feb0ffbe4f4ea1843
diff --git a/files/000-default.template b/files/apache-horizon.template
similarity index 77%
rename from files/000-default.template
rename to files/apache-horizon.template
index f499ea0..e54f16c 100644
--- a/files/000-default.template
+++ b/files/apache-horizon.template
@@ -1,13 +1,13 @@
<VirtualHost *:80>
WSGIScriptAlias / %HORIZON_DIR%/openstack_dashboard/wsgi/django.wsgi
- WSGIDaemonProcess horizon user=%USER% group=%GROUP% processes=3 threads=10
+ WSGIDaemonProcess horizon user=%USER% group=%GROUP% processes=3 threads=10 home=%HORIZON_DIR%
+
SetEnv APACHE_RUN_USER %USER%
SetEnv APACHE_RUN_GROUP %GROUP%
WSGIProcessGroup horizon
DocumentRoot %HORIZON_DIR%/.blackhole/
Alias /media %HORIZON_DIR%/openstack_dashboard/static
- Alias /vpn /opt/stack/vpn
<Directory />
Options FollowSymLinks
@@ -21,8 +21,9 @@
allow from all
</Directory>
- ErrorLog /var/log/apache2/error.log
+ ErrorLog /var/log/%APACHE_NAME%/horizon_error.log
LogLevel warn
- CustomLog /var/log/apache2/access.log combined
+ CustomLog /var/log/%APACHE_NAME%/horizon_access.log combined
</VirtualHost>
+WSGISocketPrefix /var/run/%APACHE_NAME%
diff --git a/files/pips/horizon b/files/pips/horizon
index f15602e..c247542 100644
--- a/files/pips/horizon
+++ b/files/pips/horizon
@@ -1,3 +1,5 @@
+django-mailer # dist:f16
+django-nose # dist:f16
django-nose-selenium
pycrypto==2.3
python-cloudfiles
diff --git a/files/rpms/general b/files/rpms/general
new file mode 100644
index 0000000..af199d5
--- /dev/null
+++ b/files/rpms/general
@@ -0,0 +1,14 @@
+curl
+euca2ools # only for testing client
+git-core
+openssh-server
+psmisc
+pylint
+python-pep8
+python-pip
+python-unittest2
+python-virtualenv
+screen
+tcpdump
+unzip
+wget
diff --git a/files/rpms/glance b/files/rpms/glance
new file mode 100644
index 0000000..141fe97
--- /dev/null
+++ b/files/rpms/glance
@@ -0,0 +1,8 @@
+python-argparse
+python-eventlet
+python-greenlet
+python-paste-deploy
+python-routes
+python-sqlalchemy
+python-wsgiref
+pyxattr
diff --git a/files/rpms/horizon b/files/rpms/horizon
new file mode 100644
index 0000000..3c5fbc1
--- /dev/null
+++ b/files/rpms/horizon
@@ -0,0 +1,25 @@
+Django
+django-registration
+gcc
+httpd # NOPRIME
+mod_wsgi # NOPRIME
+pylint
+python-anyjson
+python-boto
+python-coverage
+python-dateutil
+python-eventlet
+python-greenlet
+python-httplib2
+python-kombu
+python-migrate
+python-mox
+python-nose
+python-paste
+python-paste-deploy
+python-pep8
+python-routes
+python-sphinx
+python-sqlalchemy
+python-webob
+pyxattr
diff --git a/files/rpms/keystone b/files/rpms/keystone
new file mode 100644
index 0000000..59868c7
--- /dev/null
+++ b/files/rpms/keystone
@@ -0,0 +1,11 @@
+python-greenlet
+python-lxml
+python-paste
+python-paste-deploy
+python-paste-script
+python-routes
+python-setuptools
+python-sqlalchemy
+python-sqlite2
+python-webob
+sqlite
diff --git a/files/rpms/n-api b/files/rpms/n-api
new file mode 100644
index 0000000..0f08daa
--- /dev/null
+++ b/files/rpms/n-api
@@ -0,0 +1 @@
+python-dateutil
diff --git a/files/rpms/n-cpu b/files/rpms/n-cpu
new file mode 100644
index 0000000..1996a98
--- /dev/null
+++ b/files/rpms/n-cpu
@@ -0,0 +1,3 @@
+# Stuff for diablo volumes
+iscsi-initiator-utils
+lvm2
diff --git a/files/rpms/n-novnc b/files/rpms/n-novnc
new file mode 100644
index 0000000..24ce15a
--- /dev/null
+++ b/files/rpms/n-novnc
@@ -0,0 +1 @@
+numpy
diff --git a/files/rpms/n-vol b/files/rpms/n-vol
new file mode 100644
index 0000000..df861aa
--- /dev/null
+++ b/files/rpms/n-vol
@@ -0,0 +1,2 @@
+lvm2
+scsi-target-utils
diff --git a/files/rpms/nova b/files/rpms/nova
new file mode 100644
index 0000000..1b1d47f
--- /dev/null
+++ b/files/rpms/nova
@@ -0,0 +1,39 @@
+MySQL-python
+curl
+dnsmasq-utils # for dhcp_release
+ebtables
+gawk
+iptables
+iputils
+kpartx
+kvm
+libvirt-bin # NOPRIME
+libvirt-python
+libxml2-python
+m2crypto
+mysql-server # NOPRIME
+parted
+python-boto
+python-carrot
+python-cheetah
+python-eventlet
+python-feedparser
+python-gflags
+python-greenlet
+python-iso8601
+python-kombu
+python-lockfile
+python-migrate
+python-mox
+python-netaddr
+python-paramiko
+python-paste
+python-paste-deploy
+python-routes
+python-sqlalchemy
+python-suds
+python-tempita
+rabbitmq-server # NOPRIME
+sqlite
+sudo
+vconfig
diff --git a/files/rpms/swift b/files/rpms/swift
new file mode 100644
index 0000000..c9d49e9
--- /dev/null
+++ b/files/rpms/swift
@@ -0,0 +1,18 @@
+curl
+gcc
+memcached # NOPRIME
+python-configobj
+python-coverage
+python-devel
+python-eventlet
+python-greenlet
+python-netifaces
+python-nose
+python-paste-deploy
+python-setuptools
+python-simplejson
+python-webob
+pyxattr
+sqlite
+xfsprogs
+xinetd