From ca5c4713869fb88c2e8753039f80f1f8bf1d8fef Mon Sep 17 00:00:00 2001 From: Vincent Untz Date: Wed, 21 Nov 2012 17:45:49 +0100 Subject: [PATCH] Add package names for openSUSE/SLE Change-Id: I487cc7b8bd228ff77c9881528e3395cbe3c43d4a --- files/rpms-suse/ceilometer-collector | 4 +++ files/rpms-suse/cinder | 2 ++ files/rpms-suse/general | 23 +++++++++++++ files/rpms-suse/glance | 12 +++++++ files/rpms-suse/horizon | 23 +++++++++++++ files/rpms-suse/keystone | 17 ++++++++++ files/rpms-suse/n-api | 2 ++ files/rpms-suse/n-cpu | 4 +++ files/rpms-suse/n-novnc | 1 + files/rpms-suse/n-vol | 2 ++ files/rpms-suse/nova | 48 ++++++++++++++++++++++++++++ files/rpms-suse/postgresql | 1 + files/rpms-suse/quantum | 27 ++++++++++++++++ files/rpms-suse/ryu | 5 +++ files/rpms-suse/swift | 19 +++++++++++ lib/databases/mysql | 6 +++- lib/horizon | 2 ++ stack.sh | 14 ++++++-- 18 files changed, 209 insertions(+), 3 deletions(-) create mode 100644 files/rpms-suse/ceilometer-collector create mode 100644 files/rpms-suse/cinder create mode 100644 files/rpms-suse/general create mode 100644 files/rpms-suse/glance create mode 100644 files/rpms-suse/horizon create mode 100644 files/rpms-suse/keystone create mode 100644 files/rpms-suse/n-api create mode 100644 files/rpms-suse/n-cpu create mode 100644 files/rpms-suse/n-novnc create mode 100644 files/rpms-suse/n-vol create mode 100644 files/rpms-suse/nova create mode 100644 files/rpms-suse/postgresql create mode 100644 files/rpms-suse/quantum create mode 100644 files/rpms-suse/ryu create mode 100644 files/rpms-suse/swift diff --git a/files/rpms-suse/ceilometer-collector b/files/rpms-suse/ceilometer-collector new file mode 100644 index 0000000000..c76454fded --- /dev/null +++ b/files/rpms-suse/ceilometer-collector @@ -0,0 +1,4 @@ +# Not available in openSUSE main repositories, but can be fetched from OBS +# (devel:languages:python and server:database projects) +mongodb +python-pymongo diff --git a/files/rpms-suse/cinder b/files/rpms-suse/cinder new file mode 100644 index 0000000000..e5b47274ef --- /dev/null +++ b/files/rpms-suse/cinder @@ -0,0 +1,2 @@ +lvm2 +tgt diff --git a/files/rpms-suse/general b/files/rpms-suse/general new file mode 100644 index 0000000000..8ed74ec0f7 --- /dev/null +++ b/files/rpms-suse/general @@ -0,0 +1,23 @@ +bridge-utils +curl +euca2ools +git-core +iputils +openssh +psmisc +python-cmd2 # dist:opensuse-12.3 +python-netaddr +python-pep8 +python-pip +python-pylint +python-unittest2 +python-virtualenv +screen +tar +tcpdump +unzip +vim-enhanced +wget + +findutils-locate # useful when debugging +lsof # useful when debugging diff --git a/files/rpms-suse/glance b/files/rpms-suse/glance new file mode 100644 index 0000000000..dd68ac08c8 --- /dev/null +++ b/files/rpms-suse/glance @@ -0,0 +1,12 @@ +gcc +libxml2-devel +python-PasteDeploy +python-Routes +python-SQLAlchemy +python-argparse +python-devel +python-eventlet +python-greenlet +python-iso8601 +python-wsgiref +python-xattr diff --git a/files/rpms-suse/horizon b/files/rpms-suse/horizon new file mode 100644 index 0000000000..7e46ffe0f7 --- /dev/null +++ b/files/rpms-suse/horizon @@ -0,0 +1,23 @@ +apache2 # NOPRIME +apache2-mod_wsgi # NOPRIME +nodejs +python-CherryPy # why? (coming from apts) +python-Paste +python-PasteDeploy +python-Routes +python-Sphinx +python-SQLAlchemy +python-WebOb +python-anyjson +python-beautifulsoup +python-coverage +python-dateutil +python-eventlet +python-kombu +python-mox +python-netaddr +python-nose +python-pep8 +python-pylint +python-sqlalchemy-migrate +python-xattr diff --git a/files/rpms-suse/keystone b/files/rpms-suse/keystone new file mode 100644 index 0000000000..b3c876ad77 --- /dev/null +++ b/files/rpms-suse/keystone @@ -0,0 +1,17 @@ +cyrus-sasl-devel +openldap2-devel +python-Paste +python-PasteDeploy +python-PasteScript +python-Routes +python-SQLAlchemy +python-WebOb +python-devel +python-distribute +python-setuptools # instead of python-distribute; dist:sle11sp2 +python-greenlet +python-lxml +python-mysql +python-py-bcrypt +python-pysqlite +sqlite3 diff --git a/files/rpms-suse/n-api b/files/rpms-suse/n-api new file mode 100644 index 0000000000..ad943ffdf8 --- /dev/null +++ b/files/rpms-suse/n-api @@ -0,0 +1,2 @@ +gcc # temporary because this pulls in glance to get the client without running the glance prereqs +python-dateutil diff --git a/files/rpms-suse/n-cpu b/files/rpms-suse/n-cpu new file mode 100644 index 0000000000..27d3254f65 --- /dev/null +++ b/files/rpms-suse/n-cpu @@ -0,0 +1,4 @@ +# Stuff for diablo volumes +genisoimage +lvm2 +open-iscsi diff --git a/files/rpms-suse/n-novnc b/files/rpms-suse/n-novnc new file mode 100644 index 0000000000..c8722b9f66 --- /dev/null +++ b/files/rpms-suse/n-novnc @@ -0,0 +1 @@ +python-numpy diff --git a/files/rpms-suse/n-vol b/files/rpms-suse/n-vol new file mode 100644 index 0000000000..e5b47274ef --- /dev/null +++ b/files/rpms-suse/n-vol @@ -0,0 +1,2 @@ +lvm2 +tgt diff --git a/files/rpms-suse/nova b/files/rpms-suse/nova new file mode 100644 index 0000000000..0c036786d0 --- /dev/null +++ b/files/rpms-suse/nova @@ -0,0 +1,48 @@ +curl +# Note: we need to package dhcp_release in dnsmasq! +dnsmasq +ebtables +gawk +iptables +iputils +kpartx +kvm +libvirt # NOPRIME +libvirt-python +libxml2-python +mysql-community-server # NOPRIME +parted +python-M2Crypto +python-m2crypto # dist:sle11sp2 +python-Paste +python-PasteDeploy +python-Routes +python-SQLAlchemy +python-Tempita +python-boto +python-carrot +python-cheetah +python-eventlet +python-feedparser +python-greenlet +python-iso8601 +python-kombu +python-lockfile +python-lxml # needed for glance which is needed for nova --- this shouldn't be here +python-mox +python-mysql +python-netaddr +python-paramiko +python-python-gflags +python-sqlalchemy-migrate +python-suds +python-xattr # needed for glance which is needed for nova --- this shouldn't be here +rabbitmq-server # NOPRIME +socat +sqlite3 +sudo +vlan + +# FIXME: qpid is not part of openSUSE, those names are tentative +python-qpid # NOPRIME +qpidd # NOPRIME diff --git a/files/rpms-suse/postgresql b/files/rpms-suse/postgresql new file mode 100644 index 0000000000..bf19d397cb --- /dev/null +++ b/files/rpms-suse/postgresql @@ -0,0 +1 @@ +python-psycopg2 diff --git a/files/rpms-suse/quantum b/files/rpms-suse/quantum new file mode 100644 index 0000000000..068c15c22f --- /dev/null +++ b/files/rpms-suse/quantum @@ -0,0 +1,27 @@ +# Note: we need to package dhcp_release in dnsmasq! +dnsmasq +ebtables +iptables +iputils +mysql-community-server # NOPRIME +python-boto +python-eventlet +python-greenlet +python-iso8601 +python-kombu +python-mysql +python-netaddr +python-Paste +python-PasteDeploy +python-pyudev +python-Routes +python-SQLAlchemy +python-suds +rabbitmq-server # NOPRIME +sqlite3 +sudo +vlan + +# FIXME: qpid is not part of openSUSE, those names are tentative +python-qpid # NOPRIME +qpidd # NOPRIME diff --git a/files/rpms-suse/ryu b/files/rpms-suse/ryu new file mode 100644 index 0000000000..763fd24cdd --- /dev/null +++ b/files/rpms-suse/ryu @@ -0,0 +1,5 @@ +python-distribute +python-setuptools # instead of python-distribute; dist:sle11sp2 +python-Sphinx +python-gevent +python-python-gflags diff --git a/files/rpms-suse/swift b/files/rpms-suse/swift new file mode 100644 index 0000000000..db379bbcdf --- /dev/null +++ b/files/rpms-suse/swift @@ -0,0 +1,19 @@ +curl +gcc +memcached +python-PasteDeploy +python-WebOb +python-configobj +python-coverage +python-devel +python-distribute +python-setuptools # instead of python-distribute; dist:sle11sp2 +python-eventlet +python-greenlet +python-netifaces +python-nose +python-simplejson +python-xattr +sqlite3 +xfsprogs +xinetd diff --git a/lib/databases/mysql b/lib/databases/mysql index fc6a3b7a5c..eb84f2ca40 100644 --- a/lib/databases/mysql +++ b/lib/databases/mysql @@ -84,7 +84,11 @@ EOF chmod 0600 $HOME/.my.cnf fi # Install mysql-server - install_package mysql-server + if is_suse; then + install_package mysql-community-server + else + install_package mysql-server + fi } function database_connection_url_mysql { diff --git a/lib/horizon b/lib/horizon index af09f7700a..a378baf21d 100644 --- a/lib/horizon +++ b/lib/horizon @@ -111,6 +111,8 @@ function install_horizon() { if [[ "$os_PACKAGE" = "deb" ]]; then # Install apache2, which is NOPRIME'd install_package apache2 libapache2-mod-wsgi + elif is_suse; then + install_package apache2 apache2-mod_wsgi else sudo rm -f /etc/httpd/conf.d/000-* install_package httpd mod_wsgi diff --git a/stack.sh b/stack.sh index 70f461040c..0e3a3b1828 100755 --- a/stack.sh +++ b/stack.sh @@ -715,12 +715,18 @@ set -o xtrace echo_summary "Installing package prerequisites" if [[ "$os_PACKAGE" = "deb" ]]; then install_package $(get_packages $FILES/apts) +elif is_suse; then + install_package $(get_packages $FILES/rpms-suse) else install_package $(get_packages $FILES/rpms) fi if [[ $SYSLOG != "False" ]]; then - install_package rsyslog-relp + if is_suse; then + install_package rsyslog-module-relp + else + install_package rsyslog-relp + fi fi if is_service_enabled rabbit; then @@ -738,7 +744,11 @@ elif is_service_enabled qpid; then fi elif is_service_enabled zeromq; then if [[ "$os_PACKAGE" = "rpm" ]]; then - install_package zeromq python-zmq + if is_suse; then + install_package libzmq1 python-pyzmq + else + install_package zeromq python-zmq + fi else install_package libzmq1 python-zmq fi