openstack/devstack
Code Issues Proposed changes

Merge "Make openSUSE port up-to-date"

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

2
files/rpms-suse/nova
View File

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

1
files/rpms-suse/ryu
View File

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

4
lib/ldap
View File

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

3
lib/quantum_plugins/agent_loadbalancer
View File

@ -11,6 +11,9 @@ AGENT_LBAAS_BINARY="$QUANTUM_DIR/bin/quantum-lbaas-agent"
function quantum_agent_lbaas_install_agent_packages() { function quantum_agent_lbaas_install_agent_packages() {
if is_ubuntu || is_fedora; then if is_ubuntu || is_fedora; then
install_package haproxy 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 fi
} }

4
lib/quantum_plugins/ovs_base
View File

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