Merge "Make openSUSE port up-to-date"

This commit is contained in:
Jenkins 2013-03-14 21:15:31 +00:00 committed by Gerrit Code Review
commit c3c04fdba4
7 changed files with 13 additions and 5 deletions

3
files/rpms-suse/ldap Normal file
View File

@ -0,0 +1,3 @@
openldap2
openldap2-client
python-ldap

1
files/rpms-suse/n-spice Normal file
View File

@ -0,0 +1 @@
python-numpy

View File

@ -3,6 +3,7 @@ curl
dnsmasq
ebtables
gawk
genisoimage # required for config_drive
iptables
iputils
kpartx
@ -34,6 +35,7 @@ python-lxml # needed for glance which is needed for nova --- this shouldn't be h
python-mox
python-mysql
python-netaddr
python-numpy # needed by websockify for spice console
python-paramiko
python-python-gflags
python-sqlalchemy-migrate

View File

@ -2,4 +2,5 @@ python-distribute
python-setuptools # instead of python-distribute; dist:sle11sp2
python-Sphinx
python-gevent
python-netifaces
python-python-gflags

View File

@ -16,13 +16,11 @@ function install_ldap() {
echo "os_VENDOR is $os_VENDOR"
printf "installing"
if is_ubuntu; then
echo "os vendor is Ubuntu"
LDAP_OLCDB_NUMBER=1
LDAP_ROOTPW_COMMAND=replace
sudo DEBIAN_FRONTEND=noninteractive apt-get install slapd ldap-utils
#automatically starts LDAP on ubuntu so no need to call start_ldap
elif is_fedora; then
echo "os vendor is Fedora"
elif is_fedora || is_suse; then
LDAP_OLCDB_NUMBER=2
LDAP_ROOTPW_COMMAND=add
start_ldap

View File

@ -11,6 +11,9 @@ AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"
function quantum_agent_lbaas_install_agent_packages() {
if is_ubuntu || is_fedora; then
install_package haproxy
elif is_suse; then
### FIXME: Find out if package can be pushed to Factory
echo "HAProxy packages can be installed from server:http project in OBS"
fi
}

View File

@ -29,8 +29,8 @@ function _quantum_ovs_base_install_agent_packages() {
# Ensure that the service is started
restart_service openvswitch
elif is_suse; then
### FIXME: Find RPMs for OpenVSwitch
echo "OpenVSwitch packages need to be located"
### FIXME: Find out if package can be pushed to Factory
echo "OpenVSwitch packages can be installed from Cloud:OpenStack:Master in OBS"
restart_service openvswitch
fi
}